[josm] 01/05: Imported Upstream version 0.0.svn11223+dfsg

Bas Couwenberg sebastic at debian.org
Mon Nov 7 07:21:56 UTC 2016


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

sebastic pushed a commit to branch master
in repository josm.

commit 6e7bda69549640358b0335abf1a7328aff23dddd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Nov 7 07:46:42 2016 +0100

    Imported Upstream version 0.0.svn11223+dfsg
---
 .classpath                                         |   13 +-
 README                                             |    4 +-
 REVISION                                           |   10 +-
 build.xml                                          |   12 +-
 data/defaultpresets.xml                            |   57 +-
 data/validator/addresses.mapcss                    |   18 +-
 data/validator/combinations.mapcss                 |  110 +-
 data/validator/deprecated.mapcss                   |  179 +-
 data/validator/geometry.mapcss                     |   28 +-
 data/validator/highway.mapcss                      |    8 +
 data/validator/ignoretags.cfg                      |    6 +-
 data/validator/relation.mapcss                     |    1 +
 data/validator/religion.mapcss                     |    1 +
 data/validator/unnecessary.mapcss                  |    4 +-
 data/validator/wikipedia.mapcss                    |    1 +
 data_nodist/trans/ast.lang                         |  Bin 8856 -> 8864 bytes
 data_nodist/trans/be.lang                          |  Bin 17745 -> 18102 bytes
 data_nodist/trans/bg.lang                          |  Bin 2419 -> 2427 bytes
 data_nodist/trans/ca-valencia.lang                 |  Bin 7799 -> 7807 bytes
 data_nodist/trans/ca.lang                          |  Bin 10518 -> 10526 bytes
 data_nodist/trans/cs.lang                          |  Bin 10999 -> 11233 bytes
 data_nodist/trans/da.lang                          |  Bin 10337 -> 10543 bytes
 data_nodist/trans/de.lang                          |  Bin 11576 -> 11857 bytes
 data_nodist/trans/el.lang                          |  Bin 1421 -> 1429 bytes
 data_nodist/trans/en.lang                          |  Bin 9498 -> 9671 bytes
 data_nodist/trans/en_AU.lang                       |  Bin 1506 -> 1514 bytes
 data_nodist/trans/en_GB.lang                       |  Bin 2138 -> 2146 bytes
 data_nodist/trans/es.lang                          |  Bin 11948 -> 12604 bytes
 data_nodist/trans/et.lang                          |  Bin 1398 -> 1406 bytes
 data_nodist/trans/fi.lang                          |  Bin 3019 -> 3027 bytes
 data_nodist/trans/fr.lang                          |  Bin 11436 -> 11444 bytes
 data_nodist/trans/gl.lang                          |  Bin 2969 -> 2977 bytes
 data_nodist/trans/hu.lang                          |  Bin 11155 -> 12634 bytes
 data_nodist/trans/id.lang                          |  Bin 6709 -> 6717 bytes
 data_nodist/trans/it.lang                          |  Bin 10463 -> 10471 bytes
 data_nodist/trans/ja.lang                          |  Bin 11724 -> 11732 bytes
 data_nodist/trans/km.lang                          |  Bin 16879 -> 16887 bytes
 data_nodist/trans/lt.lang                          |  Bin 2020 -> 2028 bytes
 data_nodist/trans/nb.lang                          |  Bin 1697 -> 1705 bytes
 data_nodist/trans/nl.lang                          |  Bin 11777 -> 12376 bytes
 data_nodist/trans/pl.lang                          |  Bin 2853 -> 2861 bytes
 data_nodist/trans/pt.lang                          |  Bin 12931 -> 13637 bytes
 data_nodist/trans/pt_BR.lang                       |  Bin 10168 -> 10176 bytes
 data_nodist/trans/ru.lang                          |  Bin 18136 -> 18464 bytes
 data_nodist/trans/sk.lang                          |  Bin 10150 -> 10510 bytes
 data_nodist/trans/sv.lang                          |  Bin 1320 -> 1328 bytes
 data_nodist/trans/uk.lang                          |  Bin 18472 -> 18832 bytes
 data_nodist/trans/vi.lang                          |  Bin 10745 -> 10753 bytes
 data_nodist/trans/zh_CN.lang                       |  Bin 7608 -> 7616 bytes
 data_nodist/trans/zh_TW.lang                       |  Bin 4658 -> 4666 bytes
 i18n/po/af.po                                      | 3041 ++++++------
 i18n/po/am.po                                      | 3041 ++++++------
 i18n/po/ar.po                                      | 3091 ++++++------
 i18n/po/ast.po                                     | 1349 +++---
 i18n/po/az.po                                      | 3041 ++++++------
 i18n/po/be.po                                      | 1375 +++---
 i18n/po/bg.po                                      | 3875 ++++++++-------
 i18n/po/bn.po                                      | 3043 ++++++------
 i18n/po/br.po                                      | 3039 ++++++------
 i18n/po/bs.po                                      | 3039 ++++++------
 i18n/po/ca.po                                      | 1357 +++---
 i18n/po/ca at valencia.po                             | 1339 +++---
 i18n/po/cs.po                                      | 1389 +++---
 i18n/po/cy.po                                      | 3041 ++++++------
 i18n/po/da.po                                      | 1410 +++---
 i18n/po/de.po                                      | 1457 +++---
 i18n/po/de_DE.po                                   | 3055 ++++++------
 i18n/po/el.po                                      | 3729 ++++++++-------
 i18n/po/en_AU.po                                   | 1339 +++---
 i18n/po/en_CA.po                                   | 3041 ++++++------
 i18n/po/en_GB.po                                   | 1369 +++---
 i18n/po/eo.po                                      | 3148 +++++++------
 i18n/po/es.po                                      | 1418 +++---
 i18n/po/et.po                                      | 3245 +++++++------
 i18n/po/eu.po                                      | 3085 ++++++------
 i18n/po/fa.po                                      | 3043 ++++++------
 i18n/po/fi.po                                      | 1337 +++---
 i18n/po/fil.po                                     | 3041 ++++++------
 i18n/po/fo.po                                      | 3039 ++++++------
 i18n/po/fr.po                                      | 1379 +++---
 i18n/po/ga.po                                      | 3039 ++++++------
 i18n/po/gl.po                                      | 1331 +++---
 i18n/po/he.po                                      | 3391 +++++++-------
 i18n/po/hi.po                                      | 3039 ++++++------
 i18n/po/hr.po                                      | 3051 ++++++------
 i18n/po/ht.po                                      | 3041 ++++++------
 i18n/po/hu.po                                      | 2843 ++++++-----
 i18n/po/hy.po                                      | 3041 ++++++------
 i18n/po/ia.po                                      | 3041 ++++++------
 i18n/po/id.po                                      | 1339 +++---
 i18n/po/is.po                                      | 3089 ++++++------
 i18n/po/it.po                                      | 1396 +++---
 i18n/po/ja.po                                      | 1355 +++---
 i18n/po/ka.po                                      | 3039 ++++++------
 i18n/po/km.po                                      | 1335 +++---
 i18n/po/ko.po                                      | 3047 ++++++------
 i18n/po/ky.po                                      | 3039 ++++++------
 i18n/po/lb.po                                      | 3041 ++++++------
 i18n/po/lo.po                                      | 3039 ++++++------
 i18n/po/lt.po                                      | 1359 +++---
 i18n/po/lv.po                                      | 3039 ++++++------
 i18n/po/mk.po                                      | 3039 ++++++------
 i18n/po/mr.po                                      | 3045 ++++++------
 i18n/po/ms.po                                      | 3041 ++++++------
 i18n/po/nb.po                                      | 1345 +++---
 i18n/po/nds.po                                     | 3041 ++++++------
 i18n/po/nl.po                                      | 1685 ++++---
 i18n/po/nn.po                                      | 3039 ++++++------
 i18n/po/oc.po                                      | 3039 ++++++------
 i18n/po/pa.po                                      | 3041 ++++++------
 i18n/po/pl.po                                      | 1476 +++---
 i18n/po/pt.po                                      | 1477 +++---
 i18n/po/pt_BR.po                                   | 1416 +++---
 i18n/po/rm.po                                      | 3041 ++++++------
 i18n/po/ro.po                                      | 3045 ++++++------
 i18n/po/ru.po                                      | 1451 +++---
 i18n/po/sk.po                                      | 1384 +++---
 i18n/po/sl.po                                      | 3099 ++++++------
 i18n/po/sq.po                                      | 3039 ++++++------
 i18n/po/sr.po                                      | 3039 ++++++------
 i18n/po/sv.po                                      | 1503 +++---
 i18n/po/ta.po                                      | 3039 ++++++------
 i18n/po/te.po                                      | 3039 ++++++------
 i18n/po/th.po                                      | 3041 ++++++------
 i18n/po/tr.po                                      | 3515 +++++++-------
 i18n/po/ug.po                                      | 3041 ++++++------
 i18n/po/uk.po                                      | 1399 +++---
 i18n/po/ur.po                                      | 3041 ++++++------
 i18n/po/vi.po                                      | 1349 +++---
 i18n/po/wae.po                                     | 3041 ++++++------
 i18n/po/zh_CN.po                                   | 4925 +++++++++++---------
 i18n/po/zh_TW.po                                   | 2622 ++++++-----
 images/presets/landuse/scree.svg                   |  156 +
 images/presets/landuse/shingle.svg                 |  158 +
 .../presets/transport/airport/holding_position.svg |  115 +
 images/presets/vehicle/ford.svg                    |  144 +-
 linux/latest/usr/bin/josm-latest                   |    2 +-
 netbeans/nbproject/project.properties              |   22 +-
 .../jcs/auxiliary/disk/block/BlockDisk.java        |    8 +-
 .../jcs/auxiliary/disk/block/BlockDiskCache.java   |   13 +-
 .../auxiliary/disk/indexed/IndexedDiskCache.java   |  120 +-
 .../disk/indexed/IndexedDiskCacheAttributes.java   |   35 +-
 .../disk/indexed/IndexedDiskElementDescriptor.java |   32 +-
 .../disk/jdbc/hsql/HSQLDiskCacheFactory.java       |   42 +-
 .../remote/AbstractRemoteCacheNoWaitFacade.java    |    5 +-
 .../commons/jcs/auxiliary/remote/RemoteCache.java  |   22 +-
 .../jcs/auxiliary/remote/RemoteCacheFactory.java   |   43 +-
 .../remote/RemoteCacheFailoverRunner.java          |   13 +-
 .../jcs/auxiliary/remote/RemoteCacheManager.java   |   74 +-
 .../jcs/auxiliary/remote/RemoteCacheNoWait.java    |    1 -
 .../auxiliary/remote/RemoteCacheNoWaitFacade.java  |   16 +-
 .../remote/http/client/AbstractHttpClient.java     |   87 +-
 .../remote/http/client/RemoteHttpCache.java        |   23 +-
 .../http/client/RemoteHttpCacheDispatcher.java     |   16 +-
 .../remote/http/client/RemoteHttpCacheFactory.java |   99 +-
 .../remote/http/client/RemoteHttpCacheManager.java |  266 --
 .../remote/http/client/RemoteHttpCacheMonitor.java |   51 +-
 .../remote/server/RemoteCacheServerFactory.java    |    2 +-
 .../commons/jcs/utils/struct/SingleLinkedList.java |  137 -
 .../jcs/utils/struct/SortedPreferentialArray.java  |  612 ---
 src/org/openstreetmap/josm/Main.java               |  209 +-
 .../josm/actions/AbstractMergeAction.java          |    2 +-
 .../josm/actions/AddImageryLayerAction.java        |  168 +-
 .../josm/actions/CombineWayAction.java             |    1 -
 .../josm/actions/CreateMultipolygonAction.java     |    2 +-
 .../josm/actions/DeleteLayerAction.java            |    3 +-
 .../josm/actions/DistributeAction.java             |    4 +-
 .../josm/actions/DownloadPrimitiveAction.java      |    6 +-
 src/org/openstreetmap/josm/actions/ExitAction.java |    2 +-
 .../josm/actions/ImageryAdjustAction.java          |   41 +-
 src/org/openstreetmap/josm/actions/JosmAction.java |   26 +-
 .../openstreetmap/josm/actions/JumpToAction.java   |    5 +-
 .../josm/actions/MergeLayerAction.java             |    3 +-
 .../josm/actions/MergeNodesAction.java             |   25 +-
 .../josm/actions/OrthogonalizeAction.java          |   14 +-
 .../openstreetmap/josm/actions/RestartAction.java  |    5 +-
 .../josm/actions/SessionSaveAsAction.java          |    4 +-
 .../josm/actions/ShowStatusReportAction.java       |    6 +-
 .../josm/actions/SimplifyWayAction.java            |   30 +-
 .../josm/actions/UploadSelectionAction.java        |    4 +-
 .../actions/downloadtasks/DownloadGpsTask.java     |   18 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |   23 +-
 .../josm/actions/mapmode/ParallelWayAction.java    |    4 +-
 .../josm/actions/relation/SelectMembersAction.java |    2 +-
 .../josm/actions/search/SearchCompiler.java        |    4 +-
 src/org/openstreetmap/josm/command/AddCommand.java |    4 +-
 src/org/openstreetmap/josm/command/Command.java    |    5 +-
 .../openstreetmap/josm/command/MoveCommand.java    |   11 +-
 .../josm/corrector/ReverseWayTagCorrector.java     |   84 +-
 src/org/openstreetmap/josm/data/APIDataSet.java    |   58 +-
 src/org/openstreetmap/josm/data/Data.java          |    9 +-
 src/org/openstreetmap/josm/data/Preferences.java   |   43 +-
 .../josm/data/SystemOfMeasurement.java             |    2 +-
 .../josm/data/cache/JCSCacheManager.java           |    2 +
 src/org/openstreetmap/josm/data/coor/LatLon.java   |  178 +-
 .../openstreetmap/josm/data/coor/QuadTiling.java   |   41 -
 .../josm/data/correction/TagCorrection.java        |   19 +
 src/org/openstreetmap/josm/data/gpx/GpxData.java   |   15 +-
 .../josm/data/imagery/AbstractWMSTileSource.java   |  184 +
 .../josm/data/imagery/CachedTileLoaderFactory.java |    2 +
 .../data/imagery/GetCapabilitiesParseHelper.java   |  213 +
 .../josm/data/imagery/ImageryInfo.java             |   42 +-
 .../josm/data/imagery/TemplatedWMSTileSource.java  |  169 +-
 .../josm/data/imagery/WMTSTileSource.java          |  370 +-
 src/org/openstreetmap/josm/data/osm/Changeset.java |    9 +-
 .../josm/data/osm/ChangesetCache.java              |   11 +-
 .../josm/data/osm/ChangesetDataSet.java            |   13 +-
 src/org/openstreetmap/josm/data/osm/DataSet.java   |   37 +-
 .../josm/data/osm/MultipolygonBuilder.java         |   83 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |  107 +-
 .../josm/data/osm/OsmPrimitiveComparator.java      |  121 +-
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |    3 -
 src/org/openstreetmap/josm/data/osm/Relation.java  |   39 +-
 src/org/openstreetmap/josm/data/osm/Storage.java   |    2 +-
 .../openstreetmap/josm/data/osm/TagCollection.java |   18 +-
 .../data/osm/visitor/paint/MapPaintSettings.java   |   36 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |  243 +-
 .../osm/visitor/paint/WireframeMapRenderer.java    |    5 +-
 .../visitor/paint/relations/MultipolygonCache.java |    7 +-
 .../josm/data/preferences/AbstractProperty.java    |    1 +
 .../josm/data/projection/CustomProjection.java     |    4 +-
 .../josm/data/projection/Projections.java          |    6 +-
 .../josm/data/projection/datum/NTV2Util.java       |    2 +-
 .../josm/data/validation/FixableTestError.java     |  122 -
 .../josm/data/validation/OsmValidator.java         |    5 +-
 .../openstreetmap/josm/data/validation/Test.java   |    2 +-
 .../josm/data/validation/TestError.java            |  239 +-
 .../data/validation/routines/DomainValidator.java  |   19 +-
 .../josm/data/validation/tests/Addresses.java      |   52 +-
 .../data/validation/tests/ApiCapabilitiesTest.java |    5 +-
 .../data/validation/tests/BarriersEntrances.java   |    6 +-
 .../josm/data/validation/tests/Coastlines.java     |  304 +-
 .../data/validation/tests/ConditionalKeys.java     |   10 +-
 .../josm/data/validation/tests/CrossingWays.java   |   69 +-
 .../josm/data/validation/tests/DuplicateNode.java  |  174 +-
 .../data/validation/tests/DuplicateRelation.java   |   10 +-
 .../josm/data/validation/tests/DuplicateWay.java   |   10 +-
 .../data/validation/tests/DuplicatedWayNodes.java  |    8 +-
 .../josm/data/validation/tests/Highways.java       |   67 +-
 .../josm/data/validation/tests/InternetTags.java   |    8 +-
 .../josm/data/validation/tests/Lanes.java          |   16 +-
 .../josm/data/validation/tests/LongSegment.java    |   11 +-
 .../data/validation/tests/MapCSSTagChecker.java    |  121 +-
 .../data/validation/tests/MultipolygonTest.java    |  243 +-
 .../josm/data/validation/tests/NameMismatch.java   |   28 +-
 .../data/validation/tests/OpeningHourTest.java     |   15 +-
 .../data/validation/tests/OverlappingWays.java     |   16 +-
 .../josm/data/validation/tests/PowerLines.java     |   70 +-
 .../validation/tests/PublicTransportRouteTest.java |   17 +-
 .../data/validation/tests/RelationChecker.java     |   81 +-
 .../data/validation/tests/SelfIntersectingWay.java |   10 +-
 .../data/validation/tests/SimilarNamedWays.java    |    5 +-
 .../josm/data/validation/tests/TagChecker.java     |  161 +-
 .../data/validation/tests/TurnrestrictionTest.java |   80 +-
 .../josm/data/validation/tests/UnclosedWays.java   |   17 +-
 .../data/validation/tests/UnconnectedWays.java     |    9 +-
 .../josm/data/validation/tests/UntaggedNode.java   |   22 +-
 .../josm/data/validation/tests/UntaggedWay.java    |   30 +-
 .../data/validation/tests/WayConnectedToArea.java  |   10 +-
 .../data/validation/tests/WronglyOrderedWays.java  |    7 +-
 .../josm/gui/DefaultNameFormatter.java             |   18 +
 src/org/openstreetmap/josm/gui/ExtendedDialog.java |    2 +-
 src/org/openstreetmap/josm/gui/GettingStarted.java |   18 +-
 src/org/openstreetmap/josm/gui/ImageryMenu.java    |    2 +-
 .../openstreetmap/josm/gui/MainApplication.java    |   50 +-
 src/org/openstreetmap/josm/gui/MainFrame.java      |    2 +-
 src/org/openstreetmap/josm/gui/MainPanel.java      |    2 -
 src/org/openstreetmap/josm/gui/MapFrame.java       |    2 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |    2 +-
 src/org/openstreetmap/josm/gui/MapView.java        |  581 +--
 src/org/openstreetmap/josm/gui/MapViewState.java   |  135 +-
 .../josm/gui/NavigatableComponent.java             |   10 -
 src/org/openstreetmap/josm/gui/Notification.java   |    4 +-
 .../josm/gui/bbox/SlippyMapBBoxChooser.java        |   10 +-
 .../josm/gui/conflict/pair/ListMergeModel.java     |    9 +-
 .../josm/gui/conflict/pair/nodes/package-info.java |    6 +
 .../josm/gui/conflict/pair/package-info.java       |    6 +
 .../gui/conflict/pair/properties/package-info.java |    6 +
 .../gui/conflict/pair/relation/package-info.java   |    6 +
 .../josm/gui/conflict/pair/tags/package-info.java  |    6 +
 .../josm/gui/conflict/tags/package-info.java       |    6 +
 .../gui/datatransfer/PrimitiveTransferable.java    |    2 +-
 .../josm/gui/datatransfer/TagTransferable.java     |    2 +-
 .../datatransfer/data/PrimitiveTransferData.java   |    8 +-
 .../gui/dialogs/CommandListMutableTreeNode.java    |   17 +-
 .../josm/gui/dialogs/InspectPrimitiveDialog.java   |    7 +-
 .../josm/gui/dialogs/LatLonDialog.java             |  171 +-
 .../josm/gui/dialogs/MenuItemSearchDialog.java     |   10 +-
 .../josm/gui/dialogs/NotesDialog.java              |   21 +
 .../josm/gui/dialogs/OsmIdSelectionDialog.java     |    5 +-
 .../josm/gui/dialogs/SelectionListDialog.java      |    8 +-
 .../dialogs/changeset/ChangesetCacheManager.java   |   54 +
 .../query/AdvancedChangesetQueryPanel.java         |   77 +-
 .../josm/gui/dialogs/layer/DeleteLayerAction.java  |   10 +-
 .../gui/dialogs/layer/LayerVisibilityAction.java   |   54 +-
 .../dialogs/properties/PropertiesCellRenderer.java |    2 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |   80 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |   16 +-
 .../gui/dialogs/relation/actions/SavingAction.java |    3 +
 .../gui/dialogs/validator/ValidatorTreePanel.java  |   70 +-
 .../josm/gui/download/PlaceSelection.java          |  139 +-
 .../openstreetmap/josm/gui/draw/MapViewPath.java   |  192 +
 .../openstreetmap/josm/gui/help/HelpBrowser.java   |   19 +-
 .../josm/gui/history/CoordinateInfoViewer.java     |   12 +
 .../josm/gui/history/HistoryLoadTask.java          |   30 +-
 .../josm/gui/io/DownloadFileTask.java              |    2 +-
 .../josm/gui/io/DownloadOpenChangesetsTask.java    |   34 +-
 .../josm/gui/io/SaveLayersDialog.java              |  143 +-
 .../gui/layer/AbstractCachedTileSourceLayer.java   |    6 +-
 .../josm/gui/layer/AbstractTileSourceLayer.java    |  306 +-
 .../josm/gui/layer/CustomizeColor.java             |    2 +-
 src/org/openstreetmap/josm/gui/layer/Layer.java    |   22 -
 .../openstreetmap/josm/gui/layer/LayerManager.java |   72 +-
 .../josm/gui/layer/LayerPositionStrategy.java      |   23 +-
 .../josm/gui/layer/MainLayerManager.java           |   20 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |   39 +-
 src/org/openstreetmap/josm/gui/layer/TMSLayer.java |    5 +-
 src/org/openstreetmap/josm/gui/layer/WMSLayer.java |   27 +-
 .../openstreetmap/josm/gui/layer/WMTSLayer.java    |    2 +-
 .../gui/layer/geoimage/CorrelateGpxWithImages.java |    4 +-
 .../josm/gui/layer/geoimage/ImageEntry.java        |   39 +-
 .../gui/layer/gpx/ConvertToDataLayerAction.java    |   19 +-
 .../josm/gui/layer/gpx/DateFilterPanel.java        |    5 +-
 .../gui/layer/gpx/DownloadWmsAlongTrackAction.java |    2 +-
 .../josm/gui/layer/gpx/GpxDrawHelper.java          |    8 +-
 .../gui/layer/imagery/TileCoordinateConverter.java |    4 +-
 .../josm/gui/layer/imagery/TilePosition.java       |   53 +
 .../josm/gui/layer/imagery/TileRange.java          |   58 +
 .../josm/gui/mappaint/ElemStyles.java              |   20 +
 .../openstreetmap/josm/gui/mappaint/Keyword.java   |    8 +
 .../josm/gui/mappaint/MapPaintStyles.java          |   21 +-
 .../josm/gui/mappaint/StyleCache.java              |    3 +-
 .../josm/gui/mappaint/mapcss/Selector.java         |    4 +-
 .../gui/mappaint/styleelement/LineElement.java     |    3 +-
 .../mappaint/styleelement/RepeatImageElement.java  |   23 +-
 .../josm/gui/preferences/PreferenceTabbedPane.java |   32 +-
 .../josm/gui/preferences/SubPreferenceSetting.java |    2 +-
 .../josm/gui/preferences/ToolbarPreferences.java   |    2 +-
 .../gui/preferences/display/DrawingPreference.java |    5 +
 .../gui/preferences/display/GPXSettingsPanel.java  |    2 +-
 .../gui/preferences/imagery/AddWMSLayerPanel.java  |    4 +-
 .../gui/preferences/imagery/ImageryPreference.java |   11 +
 .../gui/preferences/plugin/PluginPreference.java   |    4 +-
 .../projection/CodeProjectionChoice.java           |    2 +-
 .../projection/ProjectionPreference.java           |    6 +-
 .../projection/UTMProjectionChoice.java            |    2 +-
 .../josm/gui/preferences/shortcut/PrefJPanel.java  |    2 +-
 .../gui/progress/PleaseWaitProgressMonitor.java    |    2 +-
 .../josm/gui/progress/ProgressMonitor.java         |    2 +-
 .../josm/gui/tagging/presets/items/Combo.java      |    2 +-
 .../gui/tagging/presets/items/MultiSelect.java     |    2 +-
 .../josm/gui/tagging/presets/items/Text.java       |    2 +-
 src/org/openstreetmap/josm/gui/util/GuiHelper.java |    2 +-
 .../josm/gui/util/HighlightHelper.java             |    2 +-
 .../josm/gui/widgets/AbstractFileChooser.java      |    2 +-
 .../josm/gui/widgets/EditableList.java             |    6 +-
 .../josm/gui/widgets/NativeFileChooser.java        |    6 +-
 .../josm/io/BoundingBoxDownloader.java             |    2 +-
 src/org/openstreetmap/josm/io/CachedFile.java      |   21 +
 .../josm/io/DefaultProxySelector.java              |    2 +-
 src/org/openstreetmap/josm/io/GeoJSONWriter.java   |    9 +-
 src/org/openstreetmap/josm/io/GpxExporter.java     |    4 +-
 src/org/openstreetmap/josm/io/NameFinder.java      |  275 ++
 src/org/openstreetmap/josm/io/NoteReader.java      |    2 +-
 src/org/openstreetmap/josm/io/OsmExporter.java     |    2 +-
 .../josm/io/OsmServerChangesetReader.java          |    9 +-
 src/org/openstreetmap/josm/io/OsmServerReader.java |   15 +-
 .../josm/io/OverpassDownloadReader.java            |   89 +-
 .../josm/io/remotecontrol/AddTagsDialog.java       |    3 +
 .../io/remotecontrol/RemoteControlHttpsServer.java |    4 +-
 .../io/remotecontrol/handler/RequestHandler.java   |   57 +-
 .../josm/io/session/SessionReader.java             |   12 +-
 .../openstreetmap/josm/plugins/PluginHandler.java  |   15 +-
 src/org/openstreetmap/josm/tools/AudioPlayer.java  |    4 +-
 src/org/openstreetmap/josm/tools/Diff.java         |    5 +-
 src/org/openstreetmap/josm/tools/I18n.java         |    2 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |   10 +
 src/org/openstreetmap/josm/tools/ListenerList.java |    2 +-
 src/org/openstreetmap/josm/tools/Logging.java      |    3 +
 src/org/openstreetmap/josm/tools/OpenBrowser.java  |    2 +-
 .../josm/tools/OverpassTurboQueryWizard.java       |    6 +-
 src/org/openstreetmap/josm/tools/PlatformHook.java |   43 +-
 .../openstreetmap/josm/tools/PlatformHookOsx.java  |   15 +-
 .../josm/tools/PlatformHookUnixoid.java            |  291 +-
 .../josm/tools/PlatformHookWindows.java            |  193 +-
 src/org/openstreetmap/josm/tools/Shortcut.java     |  160 +-
 src/org/openstreetmap/josm/tools/Utils.java        |   94 +-
 .../josm/tools/bugreport/BugReportDialog.java      |   16 +-
 .../josm/tools/bugreport/BugReportQueue.java       |   25 +-
 .../josm/tools/bugreport/DebugTextDisplay.java     |    5 +-
 .../josm/tools/bugreport/JosmUpdatePanel.java      |    4 +-
 .../josm/tools/bugreport/ReportedException.java    |    8 +-
 .../openstreetmap/josm/tools/date/DateUtils.java   |   92 +-
 .../josm/tools/template_engine/Condition.java      |    6 +-
 .../josm/tools/template_engine/Variable.java       |    2 +-
 styles/standard/elemstyles.mapcss                  |   49 +-
 test/data/invalid_api/0.6/capabilities             |    2 +
 .../openstreetmap/josm/gui/GettingStartedTest.java |   47 +
 .../josm/gui/mappaint/StyleCacheTest.java          |   75 +-
 .../josm/io/OsmServerBackreferenceReaderTest.java  |    3 +-
 .../openstreetmap/josm/tools/HttpClientTest.java   |    2 +-
 .../josm/data/osm/KeyValuePerformanceTest.java     |    5 +-
 test/unit/org/openstreetmap/josm/TestUtils.java    |   36 +
 .../josm/actions/AddImageryLayerActionTest.java    |   11 +-
 .../actions/CreateMultipolygonActionTest.groovy    |   75 -
 .../josm/actions/CreateMultipolygonActionTest.java |   97 +
 .../josm/actions/DeleteLayerActionTest.java        |   43 +
 .../openstreetmap/josm/actions/ExitActionTest.java |   38 +
 .../josm/actions/MergeNodesActionTest.java         |   77 +
 .../josm/actions/SessionSaveAsActionTest.java      |   33 +
 .../josm/actions/SimplifyWayActionTest.java        |   29 +
 .../actions/downloadtasks/DownloadGpsTaskTest.java |    3 +
 .../josm/actions/search/SearchCompilerTest.java    |   14 +
 .../josm/corrector/ReverseWayTagCorrectorTest.java |   43 +
 .../openstreetmap/josm/data/AutosaveTaskTest.java  |    8 +-
 .../openstreetmap/josm/data/coor/LatLonTest.java   |  138 +-
 .../josm/data/correction/TagCorrectionTest.java    |   30 +
 .../josm/data/oauth/OAuthParametersTest.java       |    3 +-
 .../josm/data/osm/APIDataSetTest.java              |    9 +
 .../josm/data/osm/ChangesetCacheTest.groovy        |  164 -
 .../josm/data/osm/ChangesetCacheTest.java          |  215 +
 .../josm/data/osm/ChangesetDataSetTest.java        |   66 +
 .../openstreetmap/josm/data/osm/ChangesetTest.java |   70 +
 .../josm/data/osm/DataSetMergerTest.java           |   11 +-
 .../openstreetmap/josm/data/osm/DataSetTest.java   |   57 +
 .../josm/data/osm/SimplePrimitiveIdTest.groovy     |   61 -
 .../josm/data/osm/SimplePrimitiveIdTest.java       |  104 +
 .../josm/data/validation/tests/CoastlinesTest.java |   38 +
 .../data/validation/tests/DuplicateNodeTest.java   |  130 +-
 .../validation/tests/MapCSSTagCheckerTest.java     |   53 +-
 .../validation/tests/MultipolygonTestTest.java     |   46 +-
 .../data/validation/tests/NameMismatchTest.java    |    9 +
 .../validation/tests/SelfIntersectingWayTest.java  |  132 +
 .../data/validation/tests/ValidatorTestUtils.java  |   71 +
 .../josm/gui/MainApplicationTest.java              |   42 +-
 .../org/openstreetmap/josm/gui/MapStatusTest.java  |   30 +
 .../gui/conflict/pair/ConflictResolverTest.java    |   83 +
 .../josm/gui/dialogs/CommandStackDialogTest.java   |   71 +
 .../gui/dialogs/InspectPrimitiveDialogTest.java    |    2 +-
 .../josm/gui/dialogs/LatLonDialogTest.java         |   38 -
 .../josm/gui/dialogs/MinimapDialogTest.java        |   36 +
 .../ChangesetCacheTableColumnModelTest.java        |   31 +
 .../dialogs/properties/PropertiesDialogTest.java   |    2 +-
 .../dialogs/validator/ValidatorTreePanelTest.java  |   30 +-
 .../gui/io/DownloadOpenChangesetsTaskTest.java     |   47 +
 .../josm/gui/io/DownloadPrimitivesTaskTest.java    |   44 +
 .../openstreetmap/josm/gui/layer/GpxLayerTest.java |    1 -
 .../josm/gui/layer/LayerManagerTest.java           |   72 +-
 .../josm/gui/layer/LayerPositionStrategyTest.java  |   21 +
 .../josm/gui/layer/OsmDataLayerTest.java           |    8 +
 .../openstreetmap/josm/gui/layer/WMSLayerTest.java |    8 +
 .../layer/gpx/ConvertToDataLayerActionTest.java    |   42 +
 .../oauth/AuthorizationProcedureComboBoxTest.java  |   37 +
 .../oauth/FullyAutomaticAuthorizationUITest.java   |   13 +-
 .../oauth/FullyAutomaticPropertiesPanelTest.java   |   31 +
 .../josm/gui/oauth/ManualAuthorizationUITest.java  |   13 +-
 .../gui/oauth/OsmOAuthAuthorizationClientTest.java |   13 +-
 .../oauth/SemiAutomaticAuthorizationUITest.java    |   13 +-
 .../preferences/imagery/AddTMSLayerPanelTest.java  |   34 +
 .../preferences/imagery/AddWMSLayerPanelTest.java  |   34 +
 .../preferences/imagery/AddWMTSLayerPanelTest.java |   40 +
 .../preferences/imagery/ImageryPreferenceTest.java |   15 +-
 .../preferences/map/MapPaintPreferenceTestIT.java  |    5 +-
 .../map/TaggingPresetPreferenceTestIT.java         |    8 +-
 .../gui/preferences/server/ApiUrlTestTaskTest.java |   89 +
 .../server/AuthenticationPreferenceTest.java       |   15 +-
 .../server/OverpassServerPreferenceTest.java       |   15 +-
 .../preferences/server/ProxyPreferenceTest.java    |   15 +-
 .../server/ServerAccessPreferenceTest.java         |   15 +-
 .../josm/gui/util/FileFilterAllFilesTest.java      |   24 +
 .../josm/io/ChangesetQueryUrlParserTest.groovy     |   17 +-
 .../openstreetmap/josm/io/GeoJSONWriterTest.java   |   14 +
 .../org/openstreetmap/josm/io/NmeaReaderTest.java  |    8 +-
 .../josm/io/OsmChangesetParserTest.java            |   91 +
 .../josm/io/OverpassDownloadReaderTest.java        |   79 +
 .../io/auth/CredentialsAgentExceptionTest.java     |   37 +
 .../remotecontrol/handler/AddNodeHandlerTest.java  |    2 +-
 .../remotecontrol/handler/AddWayHandlerTest.java   |    2 +-
 .../remotecontrol/handler/ImageryHandlerTest.java  |    2 +-
 .../remotecontrol/handler/ImportHandlerTest.java   |    5 +-
 .../handler/LoadAndZoomHandlerTest.java            |    2 +-
 .../handler/LoadObjectHandlerTest.java             |    2 +-
 .../remotecontrol/handler/RequestHandlerTest.java  |   49 +-
 .../josm/plugins/PluginHandlerTestIT.java          |   70 +-
 .../josm/testutils/JOSMTestRules.java              |    2 +-
 .../openstreetmap/josm/tools/AudioPlayerTest.java  |    3 +
 .../openstreetmap/josm/tools/ExifReaderTest.java   |   12 +-
 .../openstreetmap/josm/tools/FontsManagerTest.java |   44 +
 .../josm/tools/OverpassTurboQueryWizardTest.java   |    2 +-
 .../josm/tools/PlatformHookOsxTest.java            |   16 -
 .../bugreport/BugReportSettingsPanelTest.java      |   31 +
 .../josm/tools/bugreport/DebugTextDisplayTest.java |   40 +
 .../josm/tools/date/DateUtilsTest.java             |   12 +
 .../tools/template_engine/TemplateParserTest.java  |   10 +
 494 files changed, 124374 insertions(+), 98912 deletions(-)

diff --git a/.classpath b/.classpath
index 4ad959f..d3dca0d 100644
--- a/.classpath
+++ b/.classpath
@@ -14,17 +14,18 @@
 	<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
-	<classpathentry kind="lib" path="test/lib/equalsverifier-2.1.5.jar"/>
+	<classpathentry kind="lib" path="test/lib/equalsverifier-2.1.6.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/guava-19.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/javassist-3.20.0-GA.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_102"/>
+	<classpathentry kind="lib" path="test/lib/system-rules-1.16.0.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
-	<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>
-	<classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.3.jar"/>
-	<classpathentry kind="lib" path="test/lib/unitils-core/commons-logging-1.1.jar"/>
+	<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.2.jar"/>
+	<classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.6.jar"/>
+	<classpathentry kind="lib" path="test/lib/unitils-core/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="lib" path="test/lib/unitils-core/ognl-2.6.9.jar"/>
-	<classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.2.jar"/>
+	<classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.3.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="lib" path="tools/findbugs/annotations.jar"/>
diff --git a/README b/README
index 5cfee2f..8a3a6d3 100644
--- a/README
+++ b/README
@@ -114,13 +114,13 @@ This is an overview of the files and directories in the JOSM code repository:
     - performance/          performance tests (source code)
     - unit/                 unit tests (source code)
 - tools/                    libraries and tools that help in the development process
-    - animal-sniffer-ant-tasks-1.14.jar
+    - animal-sniffer-ant-tasks-1.15.jar
                             used to build and check code signatures to ensure plugins binary compatibility 
     - appbundler-1.0ea.jar  used to build Mac OS X package
     - checkstyle/           libs and config files for checkstyle (automatically detects code style
                             problems in source code); can be launched as an ant target in build.xml
     - commons-cli-1.3.1.jar dependency of Groovy Ant task
-    - error_prone_ant-2.0.12.jar
+    - error_prone_ant-2.0.13.jar
                             used to detect code errors during compilation
     - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential
                             problems in source code); can be launched as an ant target in build.xml
diff --git a/REVISION b/REVISION
index b9e213a..f0b3e26 100644
--- a/REVISION
+++ b/REVISION
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <info>
 <entry
-   kind="dir"
    path="trunk"
-   revision="10966">
+   revision="11223"
+   kind="dir">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
 <repository>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="10966">
-<author>Don-vip</author>
-<date>2016-09-05T22:16:07.651665Z</date>
+   revision="11223">
+<author>simon04</author>
+<date>2016-11-06T19:18:38.809650Z</date>
 </commit>
 </entry>
 </info>
diff --git a/build.xml b/build.xml
index 5f6bb30..70ed195 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
         <property name="proj-build.dir" location="${base.dir}/build2"/>
         <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
         <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.7.jar"/>
-        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.12.jar"/>
+        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.13.jar"/>
         <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
         <!-- build parameter: compression level (ant -Dclevel=N)
                  N ranges from 0 (no compression) to 9 (maximum compression)
@@ -418,8 +418,10 @@ Build-Date: ${build.tstamp}
             <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}" excludes="jdk.dynalink.*:jdk.nashorn.*">
                 <junit printsummary="yes" fork="true" forkmode="once">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
-                    <jvmarg value="-XaddExports:java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
-                    <jvmarg value="-XaddExports:java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-exports" if:set="isJava9" />
+                    <jvmarg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-exports" if:set="isJava9" />
+                    <jvmarg value="java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
                     <sysproperty key="josm.home" value="${test.dir}/config/@{testfamily}-josm.home"/>
                     <sysproperty key="josm.test.data" value="${test.dir}/data"/>
                     <sysproperty key="java.awt.headless" value="true"/>
@@ -549,7 +551,7 @@ Build-Date: ${build.tstamp}
         <local name="plugins"/>
         <property name="dir" value="plugin-check"/>
         <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
-            <classpath path="tools/animal-sniffer-ant-tasks-1.14.jar"/>
+            <classpath path="tools/animal-sniffer-ant-tasks-1.15.jar"/>
         </typedef>
         <mkdir dir="${dir}"/>
         <!-- List of deprecated plugins -->
@@ -707,7 +709,7 @@ Build-Date: ${build.tstamp}
 
     <target name="checkstyle" depends="init-properties">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
-             classpath="tools/checkstyle/checkstyle-7.1-all.jar"/>
+             classpath="tools/checkstyle/checkstyle-7.2-all.jar"/>
         <checkstyle config="tools/checkstyle/josm_checks.xml">
             <fileset dir="${base.dir}/src/org/openstreetmap/josm" includes="**/*.java"
                 excludes="gui/mappaint/mapcss/parsergen/*.java"/>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index cebbc22..912e96e 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -29,12 +29,12 @@
         </combo>
     </chunk>
     <chunk id="riding_surface">
-        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
+        <combo key="leisure" text="Type" values="horse_riding,pitch,sports_centre,stadium,track" values_context="riding" />
         <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
     </chunk>
     <chunk id="highway_base">
         <space />
-        <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+        <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
         <combo key="lanes:forward" text="Lanes in way direction" values="1,2,3,4,5" length="3" />
         <combo key="lanes:backward" text="Lanes opposed to way direction" values="1,2,3,4,5" length="3" />
         <space />
@@ -102,7 +102,7 @@
     <chunk id="barrier_2">
         <optional text="Allowed traffic:">
             <check key="foot" text="Foot" default="on"/>
-            <check key="bicycle" text="Bicycle" default="on"/>
+            <check key="bicycle" text="Bicycle"/>
         </optional>
     </chunk>
     <chunk id="name_ref">
@@ -713,7 +713,7 @@
             <combo key="vehicle" text="Vehicle access" values="yes,no,destination" default="no" />
             <text key="maxspeed" text="Max. speed (km/h)" default="30" />
             <optional>
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
                 <reference ref="surface_smoothness" />
                 <check key="oneway" text="Oneway" />
@@ -738,7 +738,7 @@
             <key key="highway" value="living_street" />
             <text key="name" text="Name" />
             <optional>
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
@@ -913,7 +913,7 @@
             <label text="Vehicles per use" />
             <space />
             <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" match="key" />
-            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,permissive,private,no" match="keyvalue" />
+            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" match="keyvalue" />
             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
             <combo key="tourist_bus" text="Tourist buses" values="yes,no" match="key" />
@@ -948,7 +948,7 @@
             <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" />
             <optional>
                 <reference ref="name_layer" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
                 <reference ref="highway_yesno_incline_oneway" />
                 <text key="width" text="Width (meters)" />
             </optional>
@@ -963,7 +963,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:ford"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:ford"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:ford" />
-            <key key="ford" value="yes" />
+            <combo key="ford" text="Ford" values="yes,stepping_stones" default="yes" values_searchable="true" match="keyvalue!" />
             <optional>
                 <text key="name" text="Name" />
             </optional>
@@ -3479,6 +3479,13 @@
                 <text key="ref" text="Reference" />
             </optional>
         </item> <!-- Taxiway -->
+        <item name="Holding Position" icon="presets/transport/airport/holding_position.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=holding_position" />
+            <key key="aeroway" value="holding_position" />
+            <optional>
+                <text key="ref" text="Reference" />
+            </optional>
+        </item> <!-- Holding Position -->
         <item name="Helipad" icon="presets/transport/airport/helipad.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=helipad"
@@ -4900,8 +4907,8 @@
             <text key="ref" text="Point Number" />
             <text key="name" text="Point Name" />
             <text key="operator" text="Operator" />
-            <text key="phone" text="Phone Number" />
-            <label text="(Use international code, like +12-345-67890)" />
+            <text key="emergency_telephone_code" text="Emergency Phone Number" />
+            <label text="(Use number as shown on plate.)" />
             <space />
         </item> <!-- Emergency Access Point -->
         <separator/>
@@ -4943,7 +4950,10 @@
             <space />
             <key key="emergency" value="defibrillator" />
             <reference ref="oh_wheelchair" />
-            <text  key="operator" text="Operator" />
+            <text key="operator" text="Operator" />
+            <text key="defibrillator:location" text="Location description" />
+            <text key="phone" text="Phone Number" />
+            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
             <check key="indoor" text="Located inside a building?" />
             <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
             <optional>
@@ -6076,7 +6086,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <space />
-            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower,public" values_context="building" default="yes" match="keyvalue!" values_searchable [...]
+            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,college,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower,public,ruins" values_context="building" default="yes" match="keyvalue!" val [...]
             <optional>
                 <text key="name" text="Name" />
                 <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
@@ -6116,7 +6126,7 @@
                   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 />
-            <combo key="building:part" text="Building part" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,supermarket,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building:part" text="Building part" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,college,hospital,warehouse,retail,shed,supermarket,cowshed,construction,ruins" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <text key="name" text="Name" />
             <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
             <combo key="building:min_level" text="Skipped Levels" values="1,2,3,4,5,6,7,8,9,10" text_context="building" />
@@ -9150,7 +9160,7 @@
             <text key="name" text="Name" />
         </item> <!-- Nature Reserve -->
         <separator/>
-        <item name="Scree" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Scree" icon="presets/landuse/scree.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=scree"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree"
@@ -9161,11 +9171,18 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=scree"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=scree"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=scree" />
-            <label text="An accumulation of loose rocks." />
+            <label text="An accumulation of loose angular rocks." />
             <space />
             <key key="natural" value="scree" />
             <text key="name" text="Name" />
         </item> <!-- Scree -->
+        <item name="Shingle" icon="presets/landuse/shingle.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=shingle" />
+            <label text="An accumulation of loose rounded rocks on a beach or riverbed." />
+            <space />
+            <key key="natural" value="shingle" />
+            <text key="name" text="Name" />
+        </item> <!-- Shingle -->
         <item name="Fell" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=fell"
@@ -9956,7 +9973,7 @@
                 <key key="type" value="route"/>
                 <key key="route" value="bicycle"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" />
+                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" display_values="international,national,regional,local" values_sort="false" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
                 </optional>
@@ -10003,7 +10020,7 @@
                 <key key="type" value="route"/>
                 <key key="route" value="hiking"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" />
+                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" display_values="international,national,regional,local" values_sort="false"/>
                 <optional>
                     <reference ref="route_hikebike_optionals" />
                 </optional>
@@ -10019,7 +10036,7 @@
                 <key key="type" value="route"/>
                 <key key="route" value="foot"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="rwn,lwn" />
+                <combo key="network" text="Network" values="rwn,lwn" display_values="regional,local" values_sort="false" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
                 </optional>
@@ -10035,7 +10052,7 @@
                 <key key="type" value="route"/>
                 <key key="route" value="horse"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" />
+                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" display_values="international,national,regional,local" values_sort="false" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
                 </optional>
@@ -10176,7 +10193,7 @@
             <key key="type" value="associatedStreet" />
             <text key="name" text="Street name" />
             <roles>
-                <role key="street" text="street" requisite="required" type="way,closedway" member_expression="highway" />
+                <role key="street" text="street" requisite="required" type="way,closedway,multipolygon" member_expression="highway" />
                 <role key="house" text="house" requisite="required" type="node,way,closedway,multipolygon" member_expression=""addr:housenumber" | "addr:interpolation" | "addr:housename"" />
             </roles>
         </item> <!-- Associated Street -->
diff --git a/data/validator/addresses.mapcss b/data/validator/addresses.mapcss
index 596a904..4b7b149 100644
--- a/data/validator/addresses.mapcss
+++ b/data/validator/addresses.mapcss
@@ -1,4 +1,4 @@
-/* see #10232 */
+/* #10232 */
 way[addr:interpolation=odd] > node[addr:housenumber][get(split(".", tag("addr:housenumber")/2), 1)=0] {
     throwWarning: tr("Even housenumber in odd address interpolation.");
 }
@@ -7,4 +7,20 @@ way[addr:interpolation=even] > node[addr:housenumber][get(split(".", tag("addr:h
 }
 way[addr:interpolation] {
     throwOther: tr("Way with {0}. Tag each housenumber separately if possible.", "{0.key}");
+}
+
+/* #13752 */
+*[!addr:housenumber][addr:street][addr:housename=~/^[0-9]+[a-zA-Z]?$/] {
+    throwOther: tr("Object has no {0}, however, it has {1} and {2} whose value looks like a housenumber.", "{0.key}", "{1.key}", "{2.key}");
+    assertMatch: "node addr:street=foo addr:housename=1";
+    assertMatch: "node addr:street=foo addr:housename=1a";
+    assertMatch: "node addr:street=foo addr:housename=221B";
+    assertNoMatch: "node addr:street=foo addr:housename=1 addr:housenumber=1";
+    assertNoMatch: "node addr:housename=1";
+    assertNoMatch: "node addr:street=foo addr:housename=bar";
+}
+*[addr:housenumber][addr:housename]["addr:housenumber"=*"addr:housename"] {
+    throwWarning: tr("Same value of {0} and {1}", "{0.key}", "{1.key}");
+    assertMatch: "node addr:housename=1 addr:housenumber=1";
+    assertNoMatch: "node addr:housename=1 addr:housenumber=2";
 }
\ No newline at end of file
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index 41a2d1f..3a8ccb4 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -5,7 +5,6 @@
 /* {0.key} without {1.key} (warning level) */
 way[junction                   ][!highway][junction!=yes],
 *[lanes                        ][!highway],
-*[lcn                          ][!highway],
 *[living_street                ][!highway],
 *[maintenance                  ][!highway],
 *[median                       ][!highway],
@@ -76,6 +75,7 @@ way[junction                   ][!highway][junction!=yes],
 *[source:addr                  ][!/^addr:/],
 *[source:maxspeed              ][!/^maxspeed:?/] {
   throwWarning: tr("{0} without {1}", "{0.key}", "{1.key}");
+  group: tr("missing tag");
   assertMatch: "way lanes=42";
   assertNoMatch: "way lanes=42 highway=unclassified";
   assertMatch: "node source:addr:postcode=postman";
@@ -89,6 +89,7 @@ way[junction                   ][!highway][junction!=yes],
 *[leaf_type ][!leaf_cycle],
 *[leaf_cycle][!leaf_type] {
   throwOther: tr("{0} without {1}", "{0.key}", "{1.key}");
+  group: tr("missing tag");
 }
 
 /* {0.key} without {1.tag} */
@@ -108,12 +109,14 @@ way[junction                   ][!highway][junction!=yes],
 *[cutline                      ][man_made!=cutline],
 *[bunker_type                  ][military!=bunker] {
   throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
+  group: tr("missing tag");
 }
 
 /* {0.key} without {1.tag} or {2.tag} */
 *[substation                   ][power!=substation][pipeline!=substation],
 *[reservoir_type               ][landuse!=reservoir][water!=reservoir] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.tag}", "{2.tag}");
+  group: tr("missing tag");
 }
 
 /* {0.tag} without {1.key} (warning level) */
@@ -124,10 +127,12 @@ relation[route=horse][!network][type=route],
 relation[route=piste][!piste:type][type=route],
 relation[route=ski][!piste:type][type=route],
 *[tourism=information][!information],
+*[leisure=pitch][!sport],
 *[aeroway=terminal][!building],
 *[power=generator][!generator:source],
 *[amenity=place_of_worship][!religion] {
   throwWarning: tr("{0} without {1}", "{0.tag}", "{1.key}");
+  group: tr("missing tag");
 }
 
 /* {0.tag} without {1.key} (info level) */
@@ -143,6 +148,7 @@ way[power=cable                ][!voltage],
 *[amenity=parking              ][!parking],
 *[amenity=parking_entrance     ][!parking] {
   throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
+  group: tr("missing tag");
   assertMatch: "way power=line";
   assertNoMatch: "way power=line voltage=1";
   assertNoMatch: "way power=switch";
@@ -157,45 +163,53 @@ way[power=cable                ][!voltage],
 /* {0.key} without {1.key} or {2.key} */
 way[oneway][!highway][!railway] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.key}");
+  group: tr("missing tag");
 }
 
 /* {0.key} without {1.key} or {2.tag} */
 *[smoothness                   ][!highway][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking)$/],
 *[segregated                   ][!highway][railway!=crossing] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.tag}");
+  group: tr("missing tag");
 }
 
 /* {0.tag} without {1.tag} (info level) see #11600 #11393 #11850 */
 *[highway=motorway][!oneway][junction!=roundabout],
 *[highway=motorway_link][!oneway][junction!=roundabout] {
   throwOther: tr("{0} without {1}", "{0.tag}", "{1.tag}");
+  group: tr("missing tag");
 }
 
 /* {0.tag} without {1.tag} or {2.tag} */
 *[amenity=recycling][recycling_type!=container][recycling_type!=centre] {
   throwWarning: tr("{0} without {1} or {2}", "{0.tag}", "{1.tag}", "{2.tag}");
+  group: tr("missing tag");
 }
 
 /* {0.key} without {1.key}, {2.tag} or {3.tag} */
 *[intermittent                 ][!waterway][natural!~/^(water|spring)$/][ford!=yes],
 *[boat                         ][!waterway][natural!=water][landuse!=basin] {
   throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.tag}", "{3.tag}");
+  group: tr("missing tag");
 }
 
 /* {0.key} without {1.key}, {2.key} or {3.key} */
 *[snowplowing                  ][!highway][!amenity][!leisure] {
   throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.key}");
+  group: tr("missing tag");
 }
 
 /* {0.key} without {1.key}, {2.key} or {3.tag} */
 *[incline                      ][!highway][!railway][aeroway!~/^(runway|taxiway)$/],
 *[toll                         ][!highway][!barrier][route!~/^(ferry|road)$/] {
   throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.tag}");
+  group: tr("missing tag");
 }
 
 /* {0.tag} together with {1.key}, see #10837 */
 *[noname?][name] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}");
+  group: tr("suspicious tag combination");
 }
 
 /* {0.tag} together with {1.key}, see #9389, #11977, #13156 */
@@ -204,24 +218,35 @@ way[oneway=yes][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath
 way[oneway=-1 ][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
 way[oneway=-1 ][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}");
+  group: tr("suspicious tag combination");
 }
 
 /* {0.tag} together with {1.tag} (info level), see #9696 */
 *[highway=footway][oneway=no] {
   throwOther: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("suspicious tag combination");
 }
 
 /* {0.tag} together with {1.tag}, see #10186 */
 *[highway=footway][bicycle=designated] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("suspicious tag combination");
 }
 
-/* #11127 */
-way[waterway][bridge=yes] {
+/* #11127, #13727 */
+way[waterway][bridge=yes][waterway!=weir] {
   throwWarning: tr("{0} together with {1}", "{0.key}", "{1.tag}");
   suggestAlternative: "bridge=aqueduct";
+  group: tr("suspicious tag combination");
   fixAdd: "bridge=aqueduct";
 }
+way[waterway=weir][bridge=yes][highway] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  suggestAlternative: "waterway=weir + ford=yes";
+  suggestAlternative: "waterway=dam";
+  suggestAlternative: tr("two objects, one with {0} and one with {1} + {2} + {3}", "{0.tag}", "{2.key}", "{1.tag}", "layer");
+  group: tr("suspicious tag combination");
+}
 
 /* only {0.key}, see #11104 #12422 */
 *[area][eval(number_of_tags()) = 1],
@@ -229,11 +254,13 @@ way[waterway][bridge=yes] {
 *[ref][eval(number_of_tags()) = 1],
 *[lit][eval(number_of_tags()) = 1] {
   throwWarning: tr("incomplete object: only {0}", "{0.key}");
+  group: tr("missing tag");
 }
 /* only {0.key} and {1.key}, see #11104 */
 *[name][area][eval(number_of_tags()) = 2],
 *[name][ref][eval(number_of_tags()) = 2] {
   throwWarning: tr("incomplete object: only {0} and {1}", "{0.key}", "{1.key}");
+  group: tr("missing tag");
 }
 
 /* #9811, #11491, #12865 */
@@ -241,23 +268,29 @@ way[waterway][bridge=yes] {
 *[boundary][/^addr:/],
 *[highway][/^addr:/][highway!=services][highway!=rest_area][!"addr:postcode"] {
   throwWarning: tr("{0} together with addr:*", "{0.key}");
+  group: tr("suspicious tag combination");
 }
 *[!highway][postal_code]["addr:postcode"][postal_code=*"addr:postcode"] {
   throwWarning: tr("{0} together with {1}", "{1.key}", "{2.key}");
+  group: tr("suspicious tag combination");
 }
 *[!highway][postal_code]["addr:postcode"][postal_code!=*"addr:postcode"] {
   throwWarning: tr("{0} together with {1} and conflicting values", "{1.key}", "{2.key}");
+  group: tr("suspicious tag combination");
 }
 way[highway][postal_code]["addr:postcode"][postal_code=*"addr:postcode"] {
   throwWarning: tr("{0} together with {1}", "{1.key}", "{2.key}");
+  group: tr("suspicious tag combination");
   fixRemove: "addr:postcode";
 }
 way[highway][postal_code]["addr:postcode"][postal_code!=*"addr:postcode"] {
   throwWarning: tr("{0} together with {1} and conflicting values", "{1.key}", "{2.key}");
+  group: tr("suspicious tag combination");
 }
 way[highway][highway!=services][highway!=rest_area][!postal_code]["addr:postcode"] {
-  throwWarning: tr("{0} together with {1}", "{0.key}", "{2.key}");
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{4.key}");
   suggestAlternative: "postal_code";
+  group: tr("suspicious tag combination");
   fixChangeKey: "addr:postcode=>postal_code";
 }
 
@@ -265,6 +298,7 @@ way[highway][highway!=services][highway!=rest_area][!postal_code]["addr:postcode
 *[highway=footway][cycleway=lane] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
   suggestAlternative: "highway=path + foot=designated + bicycle=designated + segregated=yes";
+  group: tr("suspicious tag combination");
 }
 
 /* {0} on suspicious object */
@@ -274,10 +308,12 @@ way[highway][highway!=services][highway!=rest_area][!postal_code]["addr:postcode
 *[width   ][!highway][!railway][!waterway][!aeroway][!cycleway][!footway][!barrier][!man_made][!entrance],
 *[maxspeed][!highway][!railway][traffic_sign !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][type != enforcement][waterway !~ /^(river|canal|lock)$/][!traffic_calming] {
   throwWarning: tr("{0} on suspicious object", "{0.key}");
+  group: tr("suspicious tag combination");
 }
 
-node[amenity =~ /^(restaurant|cafe|fast_food)$/][!name][noname!=yes] {
-  throwOther: tr("restaurant without name");
+node[amenity][amenity =~ /^(restaurant|cafe|fast_food)$/][!name][noname!=yes] {
+  throwOther: tr("{0} without {1}", "{0.tag}", "{2.key}");
+  group: tr("missing tag");
   assertMatch: "node amenity=restaurant";
   assertNoMatch: "node amenity=restaurant noname=yes";
   assertNoMatch: "node amenity=restaurant name=Foobar";
@@ -287,23 +323,26 @@ way[highway][barrier],
 *[highway][waterway][waterway!=dam][waterway!=weir],
 way[highway][natural],
 *[landuse][building] {
-  throwWarning: tr("{0} used with {1}", "{0.key}", "{1.key}");
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
+  group: tr("suspicious tag combination");
   assertNoMatch: "node highway=street_lamp natural=birds_nest note=josm#10193";
 }
 
 /* #6932 */
 *[natural=water][leisure=swimming_pool] {
   throwWarning: tr("natural water used for swimming pool");
+  group: tr("suspicious tag combination");
   fixRemove: "natural";
 }
 
 /* #9593, #11183, #12418, #12761 */
-*[sport][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
+*[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)$/][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";
     assertNoMatch: "node sport=tennis leisure=pitch";
     assertNoMatch: "node sport=beachvolleyball natural=beach";
-    assertNoMatch: "node sport=skiiing landuse=piste";
+    assertNoMatch: "node sport=skiing"; /* skiing has deprecated warning */
     assertNoMatch: "node sport=swimming tourism=hotel";
     assertNoMatch: "node sport=10pin amenity=restaurant";
 }
@@ -311,18 +350,13 @@ way[highway][natural],
 /* #10140 */
 *[building:levels][!building][!building:part] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.key}");
-}
-
-/* #10471 */
-way[waterway] > node[ford?] { set ford_on_waterway; }
-way[highway] > node[ford?] { set ford_on_highway; }
-node[ford?]:in-downloaded-area!.ford_on_waterway, node[ford?]:in-downloaded-area!.ford_on_highway {
-    throwWarning: tr("{0} should be on the node where {1} and {2} intersect", "ford", "highway", "waterway");
+  group: tr("missing tag");
 }
 
 /* any other *_name tag (with some exceptions) but not a name , see #10837 #11297 #11539 */
 *[/_name$/][!name][!old_name][!loc_name][!uic_name][!artist_name][!"osak:municipality_name"][!"osak:street_name"][noname!=yes] {
   throwWarning: tr("alternative name without {0}", "{1.key}");
+  group: tr("missing tag");
 }
 
 /* #10837 */
@@ -336,6 +370,7 @@ way[destination][!oneway?][junction!=roundabout][highway] {
 way["maxspeed:forward"=*"maxspeed:backward"][!maxspeed] {
   throwWarning: tr("Same value of {0} and {1}", "{0.key}", "{1.key}");
   suggestAlternative: "maxspeed";
+  group: tr("suspicious tag combination");
   fixChangeKey: "maxspeed:forward=>maxspeed";
   fixRemove: "maxspeed:backward";
 }
@@ -343,21 +378,25 @@ way["maxspeed:forward"=*maxspeed]["maxspeed:backward"=*maxspeed][maxspeed] {
   throwWarning: tr("Same value of {0}, {1} and {2}", "{0.key}", "{1.key}", "{2.key}");
   set AllSameMaxspeed;
   suggestAlternative: "maxspeed";
+  group: tr("suspicious tag combination");
   fixRemove: "maxspeed:forward";
   fixRemove: "maxspeed:backward";
 }
 way["maxspeed:forward"]["maxspeed:backward"][maxspeed]!.AllSameMaxspeed {
   throwWarning: tr("{0} and {1} together with {2} and conflicting values", "{0.key}", "{1.key}", "{2.key}");
+  group: tr("suspicious tag combination");
 }
 way["maxspeed:forward"][maxspeed][!"maxspeed:backward"],
 way["maxspeed:backward"][maxspeed][!"maxspeed:forward"] {
   throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
+  group: tr("suspicious tag combination");
 }
 
 /* #11837 */
 way[layer][layer<0][bridge][bridge!=no][location!=underground][indoor!=yes][!tunnel],
 way[layer][layer>0][tunnel][tunnel!=no][location!=overground][indoor!=yes][!bridge] {
-  throwWarning: tr("Suspicious tag combination: {0} and {1}", "{2.tag}", "{0.tag}");
+  throwWarning: tr("{0} together with {1}", "{2.tag}", "{0.tag}");
+  group: tr("suspicious tag combination");
 }
 
 /* #12942 */
@@ -368,24 +407,29 @@ relation[oneway][type!=route] {
 /* #9182 */
 way[waterway][layer][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered!=yes][pipeline!=yes][location!=underground][eval(waylength()) > 400] {
   throwWarning: tr("Long waterway with {0} but without a tag which defines it as tunnel or underground. Remove {1} or add a tunnel tag if applicable. Also check crossing bridges and their {1} tags.", "{1.tag}", "{1.key}");
+  group: tr("suspicious tag combination");
 }
 way[waterway][layer][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered!=yes][pipeline!=yes][location!=underground][eval(waylength()) <= 400] {
   throwOther: tr("Short waterway with {0} but without a tag which defines it as tunnel or underground. Remove {1} or add a tunnel tag if applicable. Also check crossing bridges and their {1} tags.", "{1.tag}", "{1.key}");
+  group: tr("suspicious tag combination");
 }
 
 /* #13144 */
 *[unisex=yes][female=yes][male!=yes],
 *[unisex=yes][male=yes][female!=yes] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("suspicious tag combination");
 }
 *[unisex=yes][female=yes][male=yes] {
   throwWarning: tr("{0} together with {1} and {2}. Remove {1} and {2}", "{0.tag}", "{1.tag}", "{2.tag}");
+  group: tr("suspicious tag combination");
   fixRemove: "female";
   fixRemove: "male";
 }
 *[female=yes][male=yes][!unisex][shop=hairdresser] { /* for toilets male=yes female=yes unisex=no combination is valid */
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
   suggestAlternative: "unisex=yes";
+  group: tr("suspicious tag combination");
   fixRemove: "female";
   fixRemove: "male";
   fixAdd: "unisex=yes";
@@ -394,8 +438,40 @@ way[waterway][layer][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered
 /* #13138 */
 area:closed[water][natural!=water][water!=intermittent] { /* water=intermittent is deprecated and has an own warning */
   throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
+  group: tr("missing tag");
   fixAdd: "natural=water";
 }
 way!:closed[water][natural!=water][water!=intermittent] {
   throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
+  group: tr("missing tag");
+}
+
+/* see #8519, #11529, limited to motorways and trunks to avoid false positives for streets with lanes for non motorized traffic */
+way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][turn:lanes              ][tag(lanes)!=eval(count(split("|", tag("turn:lanes"))))],
+way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][change:lanes            ][tag(lanes)!=eval(count(split("|", tag("change:lanes"))))],
+way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][maxspeed:lanes          ][tag(lanes)!=eval(count(split("|", tag("maxspeed:lanes"))))],
+way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][minspeed:lanes          ][tag(lanes)!=eval(count(split("|", tag("minspeed:lanes"))))],
+way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][destination:lanes       ][tag(lanes)!=eval(count(split("|", tag("destination:lanes"))))],
+way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][destination:ref:lanes   ][tag(lanes)!=eval(count(split("|", tag("destination:ref:lanes"))))],
+way[highway =~ /^(motorway|motorway_link|trunk|trunk_link)$/][lanes][destination:symbol:lanes][tag(lanes)!=eval(count(split("|", tag("destination:symbol:lanes"))))] {
+    throwWarning: tr("Different number of lanes in the keys {0} and {1}", "{1.key}", "{2.key}");
+    group: tr("suspicious tag combination");
+}
+
+/* #13680 */
+area[golf=bunker][natural=beach] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  suggestAlternative: "natural=sand";
+  suggestAlternative: "surface=sand";
+  group: tr("suspicious tag combination");
+}
+
+/* #13705 */
+relation[type=multipolygon][building] > way {
+  set part_of_building_MP;
+}
+way["addr:housenumber"][!building][!"building:part"][!"demolished:building"][!note][!amenity][!leisure][!landuse][!man_made][!tourism][!barrier]!.part_of_building_MP {
+  /* don't exclude shop because a lot of real missing bulding tag cases have a shop tag. */
+  throwOther: tr("possibly missing {0} tag", "{1.key}");
+  group: tr("missing tag");
 }
\ No newline at end of file
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index 7ba9982..521f39a 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -1,5 +1,6 @@
 *[barrier=wire_fence] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
   suggestAlternative: "barrier=fence + fence_type=chain_link";
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=chain_link";
@@ -10,6 +11,7 @@
 *[barrier=wood_fence] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "barrier=fence + fence_type=wood";
+  group: tr("deprecated tagging");
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=wood";
 }
@@ -17,24 +19,28 @@
 node[highway=ford] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "ford=yes";
+  group: tr("deprecated tagging");
   fixRemove: "highway";
   fixAdd: "ford=yes";
 }
 way[highway=ford] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "highway=* + ford=yes";
+  group: tr("deprecated tagging");
 }
   
 *[class] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "highway";
+  group: tr("deprecated tagging");
 }
   
 *[highway=stile] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "barrier=stile";
+  group: tr("deprecated tagging");
   fixRemove: "highway";
   fixAdd: "barrier=stile";
 }
@@ -43,18 +49,21 @@ way[highway=ford] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "incline";
+  group: tr("deprecated tagging");
 }
   
 *[highway=incline_steep] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "incline";
+  group: tr("deprecated tagging");
 }
   
 *[highway=unsurfaced] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "highway=* + surface=unpaved";
+  group: tr("deprecated tagging");
   fixAdd: "highway=road";
   fixAdd: "surface=unpaved";
 }
@@ -64,12 +73,14 @@ way[highway=ford] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "landuse=forest";
   suggestAlternative: "natural=wood";
+  group: tr("deprecated tagging");
 }
   
 *[natural=marsh] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "natural=wetland + wetland=marsh";
+  group: tr("deprecated tagging");
   fixAdd: "natural=wetland";
   fixAdd: "wetland=marsh";
 }
@@ -77,29 +88,34 @@ way[highway=ford] {
 *[highway=byway] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
 }
   
 *[power_source] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "generator:source";
+  group: tr("deprecated tagging");
 }
   
 *[power_rating] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "generator:output";
+  group: tr("deprecated tagging");
 }
   
 *[shop=antique] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=antiques";
+  group: tr("deprecated tagging");
   fixAdd: "shop=antiques";
 }
 
 *[shop=bags] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=bag";
+  group: tr("deprecated tagging");
   fixAdd: "shop=bag";
 }
 
@@ -108,17 +124,20 @@ way[highway=ford] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=* + organic=yes";
   suggestAlternative: "shop=* + organic=only";
+  group: tr("deprecated tagging");
 }
 
 *[shop=pets] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=pet";
+  group: tr("deprecated tagging");
   fixAdd: "shop=pet";
 }
 
 *[shop=pharmacy] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "amenity=pharmacy";
+  group: tr("deprecated tagging");
   fixChangeKey: "shop => amenity";
 }
 
@@ -126,6 +145,7 @@ way[highway=ford] {
   /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "bicycle_parking=stands";
+  group: tr("deprecated tagging");
   fixAdd: "bicycle_parking=stands";
 }
   
@@ -133,6 +153,7 @@ way[highway=ford] {
   /* http://wiki.openstreetmap.org/wiki/Tag:emergency=phone */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "emergency=phone";
+  group: tr("deprecated tagging");
   fixRemove: "amenity";
   fixAdd: "emergency=phone";
 }
@@ -141,6 +162,7 @@ way[highway=ford] {
   /* fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "sport=gaelic_games";
+  group: tr("deprecated tagging");
   fixAdd: "sport=gaelic_games";
 }
   
@@ -149,29 +171,34 @@ way[highway=ford] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "power=plant";
   suggestAlternative: "power=substation";
+  group: tr("deprecated tagging");
 }
 
 *[power=sub_station] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "power=substation";
+  group: tr("deprecated tagging");
   fixAdd: "power=substation";
 }
   
 *[generator:method=dam] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "generator:method=water-storage";
+  group: tr("deprecated tagging");
   fixAdd: "generator:method=water-storage";
 }
   
 *[generator:method=pumped-storage] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "generator:method=water-pumped-storage";
+  group: tr("deprecated tagging");
   fixAdd: "generator:method=water-pumped-storage";
 }
   
 *[generator:method=pumping] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "generator:method=water-pumped-storage";
+  group: tr("deprecated tagging");
   fixAdd: "generator:method=water-pumped-storage";
 }
   
@@ -180,17 +207,20 @@ way[highway=ford] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "barrier=chain";
   suggestAlternative: "barrier=fence + fence_type=chain_link";
+  group: tr("deprecated tagging");
 }
 
 *[building=entrance] {
   /* see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "entrance";
+  group: tr("deprecated tagging");
 }
   
 *[board_type=board] {
   /* see #9213 - Useless tag proposed in internal preset for years */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
   fixRemove: "board_type";
 }
   
@@ -198,12 +228,14 @@ way[highway=ford] {
   /* see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "man_made=monitoring_station";
+  group: tr("deprecated tagging");
   fixAdd: "man_made=monitoring_station";
 }
   
 *[measurement=water_level] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "monitoring:water_level=yes";
+  group: tr("deprecated tagging");
   fixRemove: "measurement";
   fixAdd: "monitoring:water_level=yes";
 }
@@ -211,6 +243,7 @@ way[highway=ford] {
 *[measurement=weather] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "monitoring:weather=yes";
+  group: tr("deprecated tagging");
   fixRemove: "measurement";
   fixAdd: "monitoring:weather=yes";
 }
@@ -218,6 +251,7 @@ way[highway=ford] {
 *[measurement=seismic] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "monitoring:seismic_activity=yes";
+  group: tr("deprecated tagging");
   fixRemove: "measurement";
   fixAdd: "monitoring:seismic_activity=yes";
 }
@@ -225,12 +259,14 @@ way[highway=ford] {
 *[monitoring:river_level] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "monitoring:water_level";
+  group: tr("deprecated tagging");
   fixChangeKey: "monitoring:river_level => monitoring:water_level";
 }
 
 *[stay] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "maxstay";
+  group: tr("deprecated tagging");
   fixChangeKey: "stay => maxstay";
 }
 
@@ -238,6 +274,7 @@ way[highway=ford] {
   /* see #9554 - http://wiki.openstreetmap.org/wiki/Proposed_features/automated_external_defibrillator */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "emergency=defibrillator";
+  group: tr("deprecated tagging");
   fixAdd: "emergency=defibrillator";
 }
 
@@ -250,6 +287,7 @@ way[highway=ford] {
 *[hour_off][!restriction] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "*:conditional";
+  group: tr("deprecated tagging");
   assertMatch: "node day_on=0-12";
 }
 
@@ -287,6 +325,7 @@ way[highway=ford] {
 *[type=broad_leafed] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "leaf_type=broadleaved";
+  group: tr("deprecated tagging");
   fixRemove: "{0.key}";
   fixAdd: "leaf_type=broadleaved";
 }
@@ -296,6 +335,7 @@ way[highway=ford] {
 *[type=conifer] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "leaf_type=needleleaved";
+  group: tr("deprecated tagging");
   fixRemove: "{0.key}";
   fixAdd: "leaf_type=needleleaved";
 }
@@ -303,6 +343,7 @@ way[highway=ford] {
 *[wood=mixed] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "leaf_type=mixed";
+  group: tr("deprecated tagging");
   fixRemove: "wood";
   fixAdd: "leaf_type=mixed";
 }
@@ -311,6 +352,7 @@ way[highway=ford] {
 *[type=evergreen] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "leaf_cycle=evergreen";
+  group: tr("deprecated tagging");
   fixRemove: "{0.key}";
   fixAdd: "leaf_cycle=evergreen";
 }
@@ -319,6 +361,7 @@ way[highway=ford] {
 *[type=deciduos] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "leaf_cycle=deciduous";
+  group: tr("deprecated tagging");
   fixRemove: "type";
   fixAdd: "leaf_cycle=deciduous";
 }
@@ -326,6 +369,7 @@ way[highway=ford] {
 *[wood=deciduous] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "leaf_type + leaf_cycle";
+  group: tr("deprecated tagging");
 }
 
 node[type=palm],
@@ -334,10 +378,12 @@ way[type=palm] {
   suggestAlternative: "leaf_type";
   suggestAlternative: "trees";
   suggestAlternative: "species";
+  group: tr("deprecated tagging");
 }
 
 *[natural=land] {
   throwWarning: tr("{0} is deprecated. Please use instead a multipolygon.", "{0.tag}");
+  group: tr("deprecated tagging");
   assertMatch: "way natural=land";
 }
 
@@ -347,17 +393,20 @@ way[type=palm] {
   suggestAlternative: "ford=yes";
   suggestAlternative: "bridge=low_water_crossing";
   suggestAlternative: "embankment=yes";
+  group: tr("deprecated tagging");
 }
 
 *[bridge=swing] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "bridge:movable=swing";
   suggestAlternative: "bridge:structure=simple-suspension";
+  group: tr("deprecated tagging");
 }
 
 *[bridge=suspension] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "bridge=yes + bridge:structure=suspension";
+  group: tr("deprecated tagging");
   fixAdd: "bridge=yes";
   fixAdd: "bridge:structure=suspension";
 }
@@ -367,11 +416,13 @@ way[type=palm] {
 *[lit=interval],
 *[supervised=interval] {
   throwWarning: tr("{0} is deprecated. Please specify interval by using opening_hours syntax", "{0.tag}");
+  group: tr("deprecated tagging");
 }
 
 /* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
 *[/josm\/ignore/] {
   throwError: tr("{0} is deprecated. Please delete this object and use a private layer instead", "{0.key}");
+  group: tr("deprecated tagging");
   fixDeleteObject: this;
 }
 
@@ -380,12 +431,14 @@ way[type=palm] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "sport=scuba_diving";
   suggestAlternative: "sport=cliff_diving";
+  group: tr("deprecated tagging");
 }
 
 /* see #8281 */
 *[parking=park_and_ride] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "amenity=parking + park_ride=yes";
+  group: tr("deprecated tagging");
   fixRemove: "parking";
   fixAdd: "amenity=parking";
   fixAdd: "park_ride=yes";
@@ -422,16 +475,19 @@ way[sidewalk=yes] {
 *[waterway=water_point] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "amenity=water_point";
+  group: tr("deprecated tagging");
   fixChangeKey: "waterway => amenity";
 }
 *[waterway=waste_disposal] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "amenity=waste_disposal";
+  group: tr("deprecated tagging");
   fixChangeKey: "waterway => amenity";
 }
 *[waterway=mooring] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "mooring=yes";
+  group: tr("deprecated tagging");
   fixRemove: "waterway";
   fixAdd: "mooring=yes";
 }
@@ -441,6 +497,7 @@ way[sidewalk=yes] {
 *[building:part=yes][levels] {
   throwWarning: tr("{0} is deprecated", "{1.key}");
   suggestAlternative: "building:levels";
+  group: tr("deprecated tagging");
   fixChangeKey: "levels => building:levels";
 }
 
@@ -448,6 +505,7 @@ way[sidewalk=yes] {
 *[protected_class] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "protect_class";
+  group: tr("deprecated tagging");
   fixChangeKey: "protected_class => protect_class";
 }
 
@@ -465,9 +523,10 @@ way[sidewalk=yes] {
 }
 
 /* unclear definition, see #11183 */
-*[sport=skiing][!piste:type] {
+*[sport=skiing] {
   throwWarning: tr("Definition of {0} is unclear", "{0.tag}");
-  suggestAlternative: {1.key};
+  suggestAlternative: tr("{0} + {1} + {2}", "piste:type=*", "piste:difficulty=*", "piste:grooming=*");
+  group: tr("deprecated tagging");
 }
 
 /* see #11223 */
@@ -475,12 +534,14 @@ way[sidewalk=yes] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "{0.key}=* + intermittent=yes";
   suggestAlternative: "natural=valley";
+  group: tr("deprecated tagging");
 }
 
 /* see #10346 */
 way[oneway=1] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "oneway=yes";
+  group: tr("deprecated tagging");
   fixAdd: "oneway=yes";
 }
 
@@ -492,34 +553,47 @@ way[oneway=-1] {
 *[drinkable] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "drinking_water";
+  group: tr("deprecated tagging");
 }
 
 /* see #10329 */
 *[color][!colour] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "colour";
+  group: tr("deprecated tagging");
   fixChangeKey: "color => colour";
 }
 *[color][colour][tag(color)=tag(colour)] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("deprecated tagging");
   set samecolor;
   fixRemove: "color";
+  assertMatch: "way color=red colour=red";
+  assertNoMatch: "way color=red colour=green";
 }
 *[color][colour]!.samecolor {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("deprecated tagging");
+  assertNoMatch: "way color=red colour=red";
+  assertMatch: "way color=red colour=green";
 }
 *[/:color/]{
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: ":colour";
+  group: tr("deprecated tagging");
+  assertNoMatch: "way color=red";
+  assertMatch: "way roof:color=grey";
 }
 *[/color:/] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "colour:";
+  group: tr("deprecated tagging");
 }
 
 /* see #11234 */
 *[/=|\+|\/|&|<|>|;|'|"|%|#|@|\\|,|\.|\{|\}|\?|\*|\^|\$/] {
-  throwWarning: tr("key with uncommon character");
+  throwWarning: tr("{0}", "{0.key}");
+  group: tr("key with uncommon character");
 }
 
 /* see #11330 */
@@ -528,25 +602,33 @@ node[/^..$/],
 way[/^..$/],
 relation[/^..$/][!to] {
   throwWarning: tr("uncommon short key");
+  assertNoMatch: "relation to=Berlin";
+  assertMatch: "relation fo=bar";
+  assertMatch: "way to=bar";
+  assertMatch: "node fo=bar";
+  assertMatch: "node f=b";
 }
 
 /* see #11344 */
 *[tower=air_to_ground] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "tower=transition";
+  group: tr("deprecated tagging");
   fixAdd: "tower=transition";
 }
 *[pole=air_to_ground] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "pole=transition";
+  group: tr("deprecated tagging");
   fixAdd: "pole=transition";
 }
 
 /* see #11439 */
 *[sport=hockey] {
-  throwWarning: tr("{0} is inaccurate", "{0.tag}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "sport=field_hockey";
   suggestAlternative: "sport=ice_hockey";
+  group: tr("deprecated tagging");
 }
 
 /* see #11471 */
@@ -555,6 +637,7 @@ relation[/^..$/][!to] {
 *[sport=billiard] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "sport=billiards";
+  group: tr("deprecated tagging");
   fixAdd: "sport=billiards";
 }
 
@@ -590,6 +673,7 @@ relation[/^..$/][!to] {
 *[kp][waterway=milestone] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "distance";
+  group: tr("deprecated tagging");
   fixChangeKey: "kp => distance";
 }
 *[pk][highway=milestone],
@@ -597,18 +681,21 @@ relation[/^..$/][!to] {
 *[pk][waterway=milestone] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "distance";
+  group: tr("deprecated tagging");
   fixChangeKey: "pk => distance";
 }
 
 *[postcode] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "addr:postcode";
+  group: tr("deprecated tagging");
   suggestAlternative: "postal_code";
 }
 
 *[water=intermittent] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "intermittent=yes";
+  group: tr("deprecated tagging");
   fixRemove: "water";
   fixAdd: "intermittent=yes";
 }
@@ -617,6 +704,7 @@ relation[/^..$/][!to] {
 *[type][pipeline=marker] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "substance";
+  group: tr("deprecated tagging");
   fixChangeKey: "type => substance";
 }
 
@@ -624,22 +712,26 @@ relation[/^..$/][!to] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "landuse=farmland";
   suggestAlternative: "landuse=farmyard";
+  group: tr("deprecated tagging");
 }
 
 /* #12135 comment:11 */
 *[seamark=buoy]["seamark:type"=~/^(buoy_cardinal|buoy_installation|buoy_isolated_danger|buoy_lateral|buoy_safe_water|buoy_special_purpose|mooring)$/] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "{1.tag}";
+  group: tr("deprecated tagging");
   fixRemove: "seamark";
 }
 *[seamark=buoy]["seamark:type"!~/^(buoy_cardinal|buoy_installation|buoy_isolated_danger|buoy_lateral|buoy_safe_water|buoy_special_purpose|mooring)$/] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "{1.tag}";
+  group: tr("deprecated tagging");
 }
 /* #12135 - Tag removed rom rendering https://github.com/gravitystorm/openstreetmap-carto/pull/1830 */
 *[landuse=conservation] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "boundary=protected_area";
+  group: tr("deprecated tagging");
   fixAdd: "boundary=protected_area";
   fixRemove: "landuse";
 }
@@ -648,15 +740,18 @@ relation[/^..$/][!to] {
 *[amenity=kiosk] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=kiosk";
+  group: tr("deprecated tagging");
   fixChangeKey: "amenity => shop";
 }
 *[amenity=shop] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=*";
+  group: tr("deprecated tagging");
 }
 *[shop=fishmonger] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=seafood";
+  group: tr("deprecated tagging");
   fixAdd: "shop=seafood";
 }
 *[shop=fish] {
@@ -664,6 +759,7 @@ relation[/^..$/][!to] {
   suggestAlternative: "shop=seafood";
   suggestAlternative: "shop=pet";
   suggestAlternative: "shop=fishing";
+  group: tr("deprecated tagging");
 }
 *[shop=betting] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -673,26 +769,31 @@ relation[/^..$/][!to] {
   suggestAlternative: "leisure=amusement_arcade";
   suggestAlternative: "leisure=adult_gaming_centre";
   suggestAlternative: "amenity=gambling";
+  group: tr("deprecated tagging");
 }
 *[shop=perfume] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=perfumery";
+  group: tr("deprecated tagging");
   fixAdd: "shop=perfumery";
 }
 *[amenity=exercise_point] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "leisure=fitness_station";
+  group: tr("deprecated tagging");
   fixAdd: "leisure=fitness_station";
   fixRemove: "amenity";
 }
 *[shop=auto_parts] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=car_parts";
+  group: tr("deprecated tagging");
   fixAdd: "shop=car_parts";
 }
 *[amenity=car_repair] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=car_repair";
+  group: tr("deprecated tagging");
   fixChangeKey: "amenity => shop";
 }
 
@@ -703,6 +804,7 @@ relation[/^..$/][!to] {
 *[amenity=studio][type=video] {
   throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
   suggestAlternative: "studio";
+  group: tr("deprecated tagging");
   fixChangeKey: "type => studio";
 }
 
@@ -710,6 +812,7 @@ relation[/^..$/][!to] {
 *[power=cable_distribution_cabinet] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "man_made=street_cabinet + street_cabinet=power";
+  group: tr("deprecated tagging");
   fixAdd: "man_made=street_cabinet";
   fixAdd: "street_cabinet=power";
   fixRemove: "power";
@@ -720,11 +823,13 @@ relation[/^..$/][!to] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "man_made=water_well";
   suggestAlternative: "man_made=petroleum_well";
+  group: tr("deprecated tagging");
 }
 *[amenity=dog_bin],
 *[amenity=dog_waste_bin] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "amenity=waste_basket + waste=dog_excrement + vending=excrement_bags";
+  group: tr("deprecated tagging");
   fixAdd: "amenity=waste_basket";
   fixAdd: "waste=dog_excrement";
   fixAdd: "vending=excrement_bags";
@@ -732,28 +837,33 @@ relation[/^..$/][!to] {
 *[amenity=artwork] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "tourism=artwork";
+  group: tr("deprecated tagging");
   fixAdd: "tourism=artwork";
   fixRemove: "amenity";
 }
 *[amenity=community_center] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "amenity=community_centre";
+  group: tr("deprecated tagging");
   fixAdd: "amenity=community_centre";
 }
 *[man_made=cut_line] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "man_made=cutline";
+  group: tr("deprecated tagging");
   fixAdd: "man_made=cutline";
 }
 *[amenity=park] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "leisure=park";
+  group: tr("deprecated tagging");
   fixAdd: "leisure=park";
   fixRemove: "amenity";
 }
 *[amenity=hotel] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "tourism=hotel";
+  group: tr("deprecated tagging");
   fixAdd: "tourism=hotel";
   fixRemove: "amenity";
 }
@@ -761,6 +871,7 @@ relation[/^..$/][!to] {
 *[shop=windows] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "craft=window_construction";
+  group: tr("deprecated tagging");
   fixAdd: "craft=window_construction";
   fixRemove: "shop";
 }
@@ -769,10 +880,12 @@ relation[/^..$/][!to] {
   suggestAlternative: "amenity=college";
   suggestAlternative: "amenity=school";
   suggestAlternative: "amenity=university";
+  group: tr("deprecated tagging");
 }
 *[shop=gallery] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=art";
+  group: tr("deprecated tagging");
   fixAdd: "shop=art";
 }
 *[shop=gambling],
@@ -783,16 +896,19 @@ relation[/^..$/][!to] {
   suggestAlternative: "amenity=casino";
   suggestAlternative: "leisure=amusement_arcade";
   suggestAlternative: "amenity=gambling";
+  group: tr("deprecated tagging");
 }
 *[office=real_estate_agent] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "office=estate_agent ";
+  group: tr("deprecated tagging");
   fixAdd: "office=estate_agent ";
 }
 *[shop=glass] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=glaziery";
   suggestAlternative: "craft=glaziery";
+  group: tr("deprecated tagging");
 }
 *[amenity=proposed],
 *[amenity=proposed],
@@ -800,36 +916,46 @@ relation[/^..$/][!to] {
 *[shop=disused],
 *[historic=abandoned] {
   throwWarning: tr("{0} is deprecated. Use the {1}: key prefix instead.", "{0.tag}", "{0.value}");
+  group: tr("deprecated tagging");
 }
 
 /* #12431 */
 *[amenity=swimming_pool] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "leisure=swimming_pool";
+  group: tr("deprecated tagging");
   fixChangeKey: "amenity => leisure";
 }
 
 /* #12494 */
 *[/^[^t][^i][^g].+_[0-9]$/][!/^note_[0-9]$/][!/^description_[0-9]$/] {
-  throwOther: tr("questionable key (ending with a number): {0}", "{0.key}");
-} /*should not warn for key tiger:name_base_1 */
+  throwOther: tr("{0}", "{0.key}");
+  group: tr("questionable key (ending with a number)");
+  assertMatch: "way name_1=foo";
+  assertNoMatch: "way note_2=foo";
+  assertNoMatch: "way description_3=foo";
+  assertNoMatch: "way tiger:name_base_1=bar"; /*should not warn for key tiger:name_base_1 */
+}
 
 /* #12500 */
 *[sport=skating] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "sport=ice_skating";
   suggestAlternative: "sport=roller_skating";
+  group: tr("deprecated tagging");
 }
 
 way[barrier=wall][type=noise_barrier][!wall],
 way[barrier=wall][type=noise_barrier][wall=noise_barrier] {
   throwWarning: tr("{0} is deprecated", "{1.tag}");
   suggestAlternative: "wall=noise_barrier";
+  group: tr("deprecated tagging");
   fixChangeKey: "type => wall";
 }
 way[barrier=wall][type=noise_barrier][wall][wall!=noise_barrier] {
   throwWarning: tr("{0} is deprecated", "{1.tag}");
   suggestAlternative: "wall=noise_barrier";
+  group: tr("deprecated tagging");
 }
 
 /* #8978, 12588 */
@@ -843,12 +969,14 @@ way[barrier=wall][type=noise_barrier][wall][wall!=noise_barrier] {
   suggestAlternative: "building=hospital";
   suggestAlternative: "building=public";
   suggestAlternative: "...";
+  group: tr("deprecated tagging");
 }
 
 /* #12708 */
 *[vending=news_papers] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "vending=newspapers";
+  group: tr("deprecated tagging");
   fixAdd: "vending=newspapers";
 }
 
@@ -856,6 +984,7 @@ way[barrier=wall][type=noise_barrier][wall][wall!=noise_barrier] {
 *[service=drive_through] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "service=drive-through";
+  group: tr("deprecated tagging");
   fixAdd: "service=drive-through";
 }
 
@@ -870,18 +999,21 @@ way[waterway=canal][service][service !~ /^(irrigation|transportation|water_power
 *[name:botanical] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "species";
+  group: tr("deprecated tagging");
 }
 
 /* #13101 */
 node[pole=transition] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "location:transition=yes";
+  group: tr("deprecated tagging");
   fixAdd: "location:transition=yes";
   fixRemove: "pole";
 }
 node[tower=transition] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "location:transition=yes";
+  group: tr("deprecated tagging");
   fixAdd: "location:transition=yes";
   fixRemove: "tower";
 }
@@ -890,6 +1022,7 @@ node[tower=transition] {
 area[landuse=pond] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "natural=water + water=pond";
+  group: tr("deprecated tagging");
   fixAdd: "natural=water";
   fixAdd: "water=pond";
   fixRemove: "landuse";
@@ -900,11 +1033,45 @@ area[landuse=pond] {
 *[shop=souveniers] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=gift";
+  group: tr("deprecated tagging");
   fixAdd: "shop=gift";
 }
 
 *[vending=animal_food] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "vending=animal_feed";
+  group: tr("deprecated tagging");
   fixAdd: "vending=animal_feed";
+}
+
+/* #13653 */
+node[highway=emergency_access_point][phone][!emergency_telephone_code],
+way[highway=emergency_access_point][phone][!emergency_telephone_code] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "emergency_telephone_code";
+  group: tr("deprecated tagging");
+  fixChangeKey: "phone => emergency_telephone_code";
+  assertMatch:   "node highway=emergency_access_point phone=123";
+  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=456";
+  assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=456";
+  assertNoMatch: "node phone=123";
+}
+node[highway=emergency_access_point][phone=*emergency_telephone_code],
+way[highway=emergency_access_point][phone=*emergency_telephone_code] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "emergency_telephone_code";
+  group: tr("deprecated tagging");
+  fixRemove: "phone";
+  assertNoMatch: "node highway=emergency_access_point phone=123";
+  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123";
+  assertMatch:   "node highway=emergency_access_point phone=123 emergency_telephone_code=123";
+}
+node[highway=emergency_access_point][phone][emergency_telephone_code][phone!=*emergency_telephone_code],
+way[highway=emergency_access_point][phone][emergency_telephone_code][phone!=*emergency_telephone_code] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "emergency_telephone_code";
+  group: tr("deprecated tagging");
+  assertNoMatch: "node highway=emergency_access_point phone=123";
+  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123";
+  assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=123";
 }
\ No newline at end of file
diff --git a/data/validator/geometry.mapcss b/data/validator/geometry.mapcss
index c88dcd8..b0839cd 100644
--- a/data/validator/geometry.mapcss
+++ b/data/validator/geometry.mapcss
@@ -72,16 +72,17 @@ node[source:outline] {
   throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
 }
 
-/* {0} on a node, should be a relation; see #10252, #10769 */
+/* {0} on a node, should be a relation; Error level; see #10252, #10769 */
 node[route],
 node[restriction] {
-  throwWarning: tr("{0}=* on a node. Should be used in a relation", "{0.key}"); 
+  throwError: tr("{0}=* on a node. Should be used in a relation", "{0.key}"); 
 }
 
 /* {0} on a way, should be a node */
 way[entrance],
 way[railway=subway_entrance],
 way[man_made=survey_point],
+way[aeroway=holding_position],
 way[power=transformer],
 way[power=pole],
 way[power=tower]!:closed,
@@ -101,6 +102,7 @@ way[route=bus] {
 /* #12502 */
 node[leisure=park][natural=tree] {
   throwWarning: tr("{0} together with {1} on a node. Remove {0}.", "{0.tag}", "{1.tag}");
+  group: tr("suspicious tag combination");
   fixRemove: "leisure";
 }
 node[leisure=park][natural!=tree] {
@@ -187,11 +189,13 @@ node:unconnected:in-downloaded-area[railway=crossing],
 node:unconnected:in-downloaded-area[railway=level_crossing],
 node:unconnected:in-downloaded-area[railway=buffer_stop],
 node:unconnected:in-downloaded-area[public_transport=stop_position],
+node:unconnected:in-downloaded-area[aeroway=holding_position],
 node:unconnected:in-downloaded-area[noexit],
 node:unconnected:in-downloaded-area[waterway=dam],
 node:unconnected:in-downloaded-area[waterway=weir],
 node:unconnected:in-downloaded-area[waterway=waterfall],
 node:unconnected:in-downloaded-area[amenity=ferry_terminal],
+node:unconnected:in-downloaded-area[leisure=slipway],
 node:unconnected:in-downloaded-area[mountain_pass=yes],
 node:unconnected:in-downloaded-area[barrier=gate],
 node:unconnected:in-downloaded-area[barrier=lift_gate],
@@ -215,10 +219,11 @@ node:unconnected:in-downloaded-area[barrier=cycle_barrier],
 node:unconnected:in-downloaded-area[barrier=hampshire_gate],
 node:unconnected:in-downloaded-area[barrier=height_restrictor],
 node:unconnected:in-downloaded-area[barrier=debris] {
-  throwWarning: tr("{0} must be connected to a way", "{2.tag}");
+  throwWarning: tr("{0}", "{2.tag}");
+  group: tr("isolated node which must be connected to a way");
 }
 
-/*see #11127*/
+/* #11127 */
 way[railway][bridge] > node,
 way[highway][bridge] > node {
   set node_in_bridge;
@@ -227,7 +232,7 @@ way[waterway] > node.node_in_bridge {
   throwWarning: tr("node connects waterway and bridge");
 }
 
-/*see #11128*/
+/* #11128 */
 way[highway] > node[tourism=information][information=guidepost] {
   set guidepost;
   throwOther: tr("{0} node connected to a highway", "{1.tag}");
@@ -259,9 +264,9 @@ area:closed[place=island][eval(areasize()) < 500000] {
   fixAdd: "place=islet";
 }
 
-/* 12561 - building larger than Aalsmeer Flower Auction */
-area:closed[building][eval(areasize()) > 500000] {
-  throwWarning: tr("Too large building");
+/* #12561 - building larger than Aalsmeer Flower Auction (518000) and Tesla factory (510000) */
+area:closed[building][building!=no][eval(areasize()) > 520000] {
+  throwError: tr("Too large building");
 }
 
 /* #12577 */
@@ -283,4 +288,11 @@ way[waterway=~/^(stream|ditch|river|drain)$/]!:closed >[index=-1] node[natural!=
 way[natural=coastline] ∈ area[natural=water],
 way[natural=coastline] ∈ area[waterway=riverbank] {
   throwError: tr("Coastline inside {1}", "{0.tag}");
+}
+
+/* #10471 */
+way[waterway] > node[ford?] { set ford_on_waterway; }
+way[highway] > node[ford?] { set ford_on_highway; }
+node[ford?]:in-downloaded-area!.ford_on_waterway, node[ford?]:in-downloaded-area!.ford_on_highway {
+    throwWarning: tr("{0} should be on the node where {1} and {2} intersect", "ford", "highway", "waterway");
 }
\ No newline at end of file
diff --git a/data/validator/highway.mapcss b/data/validator/highway.mapcss
index 0a95d21..e512abc 100644
--- a/data/validator/highway.mapcss
+++ b/data/validator/highway.mapcss
@@ -54,6 +54,7 @@ way[highway=unclassified][!name][noname!=yes] {
 
 way.major_road[!ref] {
   throwOther: tr("highway without a reference");
+  group: tr("missing tag");
   assertMatch: "way highway=primary";
   assertNoMatch: "way highway=primary ref=123";
 }
@@ -96,27 +97,34 @@ way[footway=both],
 way[footway=no] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "sidewalk";
+  group: tr("deprecated tagging");
   fixChangeKey: "footway => sidewalk";
   set footway_to_sidewalk;
 }
 way[footway=none] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "sidewalk=no";
+  group: tr("deprecated tagging");
   fixRemove: "footway";
   fixAdd: "sidewalk=no";
   set footway_to_sidewalk;
 }
 way[footway][footway!=sidewalk][footway!=crossing]!.footway_to_sidewalk { /* do not trigger this rule if already one of the two previous rules applied */
   throwWarning: tr("Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use ''{3}'' instead.", "{0.key}", "{1.value}", "{2.value}", "sidewalk=left|right|both|no");
+  assertNoMatch: "way footway=left";
+  assertNoMatch: "way footway=none";
+  assertMatch: "way footway=bar";
 }
 
 /* #11270 */
 way[railway =~ /^(light_rail|miniature|narrow_gauge|preserved|rail)$/] > node { set .is_in_railway }
 way[highway =~ /^(bridleway|cycleway|footway|path|steps)$/] > node[railway != crossing].is_in_railway {
   throwWarning: tr("pedestrian railway crossing without {0}", "{0.tag}");
+  group: tr("missing tag");
   fixAdd: "railway=crossing";
 }
 way[highway =~ /^(bus_guideway|living_street|motorway|pedestrian|primary|raceway|residential|road|secondary|service|tertiary|track|trunk|unclassified)/] > node[railway != level_crossing].is_in_railway {
   throwWarning: tr("railway crossing without {0}", "{0.tag}");
+  group: tr("missing tag");
   fixAdd: "railway=level_crossing";
 }
\ No newline at end of file
diff --git a/data/validator/ignoretags.cfg b/data/validator/ignoretags.cfg
index 716b925..5b030ad 100644
--- a/data/validator/ignoretags.cfg
+++ b/data/validator/ignoretags.cfg
@@ -153,7 +153,6 @@ K:place=allotments
 K:building=civic
 K:building=houseboat
 K:building=static_caravan
-K:building=ruins
 K:leisure=recreation_ground
 K:old_railway_operator=PRR
 K:maintenance=gritting
@@ -170,6 +169,10 @@ K:hazmat=designated
 K:hazmat=no
 K:hazmat:water=no
 K:hazmat:water=permissive
+K:lanes=7
+K:lanes=8
+K:lanes=9
+K:oneway=-1
 ;
 ; Amenity Key/Value Pairs
 ;
@@ -206,7 +209,6 @@ K:military=naval_base
 ; Natural Tags
 ;
 K:natural=marsh
-K:natural=shingle
 ;
 ; Relation Tags
 ;
diff --git a/data/validator/relation.mapcss b/data/validator/relation.mapcss
index 6c0e513..8133b28 100644
--- a/data/validator/relation.mapcss
+++ b/data/validator/relation.mapcss
@@ -16,6 +16,7 @@ relation[type=public_transport][!public_transport],
 relation[type=waterway][!waterway],
 relation[type=enforcement][!enforcement] {
   throwWarning: tr("{0} relation without {0} tag", "{1.key}");
+  group: tr("missing tag");
   assertMatch: "relation type=route";
   assertNoMatch: "relation type=route route=train";
   assertMatch: "relation type=route_master";
diff --git a/data/validator/religion.mapcss b/data/validator/religion.mapcss
index 14b4c9d..484c443 100644
--- a/data/validator/religion.mapcss
+++ b/data/validator/religion.mapcss
@@ -2,6 +2,7 @@
 
 *[religion =~ /^(christian|jewish|muslim)$/][!denomination] {
   throwOther: tr("religion without denomination");
+  group: tr("missing tag");
   assertMatch: "node religion=christian";
   assertNoMatch: "node religion=christian denomination=catholic";
   assertNoMatch: "node religion=foobar";
diff --git a/data/validator/unnecessary.mapcss b/data/validator/unnecessary.mapcss
index 3d879d4..f8881fe 100644
--- a/data/validator/unnecessary.mapcss
+++ b/data/validator/unnecessary.mapcss
@@ -6,6 +6,7 @@
 *[layer="0"] {
   /* see #9365 - Useless tag layer=0 */
   throwWarning: tr("{0} is unnecessary", "{0.tag}");
+  group: tr("unnecessary tag");
   fixRemove: "{0.key}";
   assertMatch: "way layer=0";
   assertMatch: "way bridge=no";
@@ -19,12 +20,13 @@ area:closed[leisure ][area?][!highway],
 area:closed[natural ][area?],
 area:closed[shop    ][area?] {
   throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.key}");
+  group: tr("unnecessary tag");
   fixRemove: "{2.key}";
 }
 
 *[emergency=permissive] {
   /* see #9458 - emergency=permissive makes no sense */
-  throwWarning: tr("{0}={1} makes no sense", "emergency", "permissive");
+  throwWarning: tr("{0} makes no sense", "{0.tag");
   fixAdd: "emergency=yes";
   assertMatch: "way emergency=permissive";
   assertNoMatch: "way emergency=designated";
diff --git a/data/validator/wikipedia.mapcss b/data/validator/wikipedia.mapcss
index 7b04cae..bbcf085 100644
--- a/data/validator/wikipedia.mapcss
+++ b/data/validator/wikipedia.mapcss
@@ -18,6 +18,7 @@
 *[wikipedia =~ /https?:\/\//] {
   throwWarning: tr("deprecated format for wikipedia tag");
   suggestAlternative: tr("''wikipedia''=''language:page title''");
+  group: tr("deprecated tagging");
   assertMatch: "node wikipedia=http://en.wikipedia.org/wiki/OpenStreetMap";
   assertNoMatch: "node wikipedia=en:OpenStreetMap";
 }
diff --git a/data_nodist/trans/ast.lang b/data_nodist/trans/ast.lang
index aefe1f8..4758050 100644
Binary files a/data_nodist/trans/ast.lang and b/data_nodist/trans/ast.lang differ
diff --git a/data_nodist/trans/be.lang b/data_nodist/trans/be.lang
index 0162c87..7af5136 100644
Binary files a/data_nodist/trans/be.lang and b/data_nodist/trans/be.lang differ
diff --git a/data_nodist/trans/bg.lang b/data_nodist/trans/bg.lang
index 0a56de4..7c82679 100644
Binary files a/data_nodist/trans/bg.lang and b/data_nodist/trans/bg.lang differ
diff --git a/data_nodist/trans/ca-valencia.lang b/data_nodist/trans/ca-valencia.lang
index 6a2d05d..3e8572d 100644
Binary files a/data_nodist/trans/ca-valencia.lang and b/data_nodist/trans/ca-valencia.lang differ
diff --git a/data_nodist/trans/ca.lang b/data_nodist/trans/ca.lang
index 5e165a0..baa7aa9 100644
Binary files a/data_nodist/trans/ca.lang and b/data_nodist/trans/ca.lang differ
diff --git a/data_nodist/trans/cs.lang b/data_nodist/trans/cs.lang
index e031eeb..bd14d9c 100644
Binary files a/data_nodist/trans/cs.lang and b/data_nodist/trans/cs.lang differ
diff --git a/data_nodist/trans/da.lang b/data_nodist/trans/da.lang
index 19b3150..c5a5d71 100644
Binary files a/data_nodist/trans/da.lang and b/data_nodist/trans/da.lang differ
diff --git a/data_nodist/trans/de.lang b/data_nodist/trans/de.lang
index e6b3060..b424cfc 100644
Binary files a/data_nodist/trans/de.lang and b/data_nodist/trans/de.lang differ
diff --git a/data_nodist/trans/el.lang b/data_nodist/trans/el.lang
index cf9fba9..a546c56 100644
Binary files a/data_nodist/trans/el.lang and b/data_nodist/trans/el.lang differ
diff --git a/data_nodist/trans/en.lang b/data_nodist/trans/en.lang
index d9a8ee4..c29324d 100644
Binary files a/data_nodist/trans/en.lang and b/data_nodist/trans/en.lang differ
diff --git a/data_nodist/trans/en_AU.lang b/data_nodist/trans/en_AU.lang
index 478a51d..12316e5 100644
Binary files a/data_nodist/trans/en_AU.lang and b/data_nodist/trans/en_AU.lang differ
diff --git a/data_nodist/trans/en_GB.lang b/data_nodist/trans/en_GB.lang
index 8e5145d..ee794f7 100644
Binary files a/data_nodist/trans/en_GB.lang and b/data_nodist/trans/en_GB.lang differ
diff --git a/data_nodist/trans/es.lang b/data_nodist/trans/es.lang
index 555e2af..96e3e4c 100644
Binary files a/data_nodist/trans/es.lang and b/data_nodist/trans/es.lang differ
diff --git a/data_nodist/trans/et.lang b/data_nodist/trans/et.lang
index 575ea57..4848310 100644
Binary files a/data_nodist/trans/et.lang and b/data_nodist/trans/et.lang differ
diff --git a/data_nodist/trans/fi.lang b/data_nodist/trans/fi.lang
index 7cd0bba..4abd3f4 100644
Binary files a/data_nodist/trans/fi.lang and b/data_nodist/trans/fi.lang differ
diff --git a/data_nodist/trans/fr.lang b/data_nodist/trans/fr.lang
index ff55088..7f91dfa 100644
Binary files a/data_nodist/trans/fr.lang and b/data_nodist/trans/fr.lang differ
diff --git a/data_nodist/trans/gl.lang b/data_nodist/trans/gl.lang
index 95153c6..7c3c789 100644
Binary files a/data_nodist/trans/gl.lang and b/data_nodist/trans/gl.lang differ
diff --git a/data_nodist/trans/hu.lang b/data_nodist/trans/hu.lang
index b4428e6..6944c21 100644
Binary files a/data_nodist/trans/hu.lang and b/data_nodist/trans/hu.lang differ
diff --git a/data_nodist/trans/id.lang b/data_nodist/trans/id.lang
index d552952..04df697 100644
Binary files a/data_nodist/trans/id.lang and b/data_nodist/trans/id.lang differ
diff --git a/data_nodist/trans/it.lang b/data_nodist/trans/it.lang
index 16770f7..35d1067 100644
Binary files a/data_nodist/trans/it.lang and b/data_nodist/trans/it.lang differ
diff --git a/data_nodist/trans/ja.lang b/data_nodist/trans/ja.lang
index 6904c01..2fa2fa9 100644
Binary files a/data_nodist/trans/ja.lang and b/data_nodist/trans/ja.lang differ
diff --git a/data_nodist/trans/km.lang b/data_nodist/trans/km.lang
index 896956c..c0911f7 100644
Binary files a/data_nodist/trans/km.lang and b/data_nodist/trans/km.lang differ
diff --git a/data_nodist/trans/lt.lang b/data_nodist/trans/lt.lang
index 128e321..d3798b1 100644
Binary files a/data_nodist/trans/lt.lang and b/data_nodist/trans/lt.lang differ
diff --git a/data_nodist/trans/nb.lang b/data_nodist/trans/nb.lang
index 7550734..86e78c3 100644
Binary files a/data_nodist/trans/nb.lang and b/data_nodist/trans/nb.lang differ
diff --git a/data_nodist/trans/nl.lang b/data_nodist/trans/nl.lang
index 0acd6d4..9f76467 100644
Binary files a/data_nodist/trans/nl.lang and b/data_nodist/trans/nl.lang differ
diff --git a/data_nodist/trans/pl.lang b/data_nodist/trans/pl.lang
index 732c2ee..d55286c 100644
Binary files a/data_nodist/trans/pl.lang and b/data_nodist/trans/pl.lang differ
diff --git a/data_nodist/trans/pt.lang b/data_nodist/trans/pt.lang
index 4bd5944..535b3e5 100644
Binary files a/data_nodist/trans/pt.lang and b/data_nodist/trans/pt.lang differ
diff --git a/data_nodist/trans/pt_BR.lang b/data_nodist/trans/pt_BR.lang
index 0ad76f0..2d41d7e 100644
Binary files a/data_nodist/trans/pt_BR.lang and b/data_nodist/trans/pt_BR.lang differ
diff --git a/data_nodist/trans/ru.lang b/data_nodist/trans/ru.lang
index 8f9bcb6..2d3e037 100644
Binary files a/data_nodist/trans/ru.lang and b/data_nodist/trans/ru.lang differ
diff --git a/data_nodist/trans/sk.lang b/data_nodist/trans/sk.lang
index c3554c7..4c79700 100644
Binary files a/data_nodist/trans/sk.lang and b/data_nodist/trans/sk.lang differ
diff --git a/data_nodist/trans/sv.lang b/data_nodist/trans/sv.lang
index e202e1e..c3cdef3 100644
Binary files a/data_nodist/trans/sv.lang and b/data_nodist/trans/sv.lang differ
diff --git a/data_nodist/trans/uk.lang b/data_nodist/trans/uk.lang
index 4963ad3..ae12957 100644
Binary files a/data_nodist/trans/uk.lang and b/data_nodist/trans/uk.lang differ
diff --git a/data_nodist/trans/vi.lang b/data_nodist/trans/vi.lang
index 0b61d14..cc189e6 100644
Binary files a/data_nodist/trans/vi.lang and b/data_nodist/trans/vi.lang differ
diff --git a/data_nodist/trans/zh_CN.lang b/data_nodist/trans/zh_CN.lang
index 6d8aadf..3076cfc 100644
Binary files a/data_nodist/trans/zh_CN.lang and b/data_nodist/trans/zh_CN.lang differ
diff --git a/data_nodist/trans/zh_TW.lang b/data_nodist/trans/zh_TW.lang
index 63466e9..b6ce718 100644
Binary files a/data_nodist/trans/zh_TW.lang and b/data_nodist/trans/zh_TW.lang differ
diff --git a/i18n/po/af.po b/i18n/po/af.po
index aa9c291..714c700 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:31+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:31+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: af\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 8bfb04f..77cd221 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:33+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:32+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: am\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index b563fec..7b2deb6 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2015-10-08 23:09+0000\n"
 "Last-Translator: mourad101ee <mourad101ee at gmail.com>\n"
 "Language-Team: Arabic <ar at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:34+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:33+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ar\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -207,18 +207,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "إضافة طبقة صور {0}"
 
-msgid "Error"
-msgstr "خطأ"
-
-msgid "Select image format for WMS layer"
-msgstr "تحديد بنية الصورة من أجل طبقة خدمة خرائط الويب"
-
-msgid "Select WMS layers"
-msgstr "تحديد طبقات خدمة خرائط الويب"
-
-msgid "Add layers"
-msgstr "إضافة طبقات"
-
 msgid "Invalid service URL."
 msgstr "خدمة URL غير صحيحة"
 
@@ -231,6 +219,18 @@ msgstr "لا يمكن إسترجاع قائمة طبقات WMS."
 msgid "Could not parse WMS layer list."
 msgstr "لا يمكن تحليل قائمة طبقات WMS."
 
+msgid "Error"
+msgstr "خطأ"
+
+msgid "Select image format for WMS layer"
+msgstr "تحديد بنية الصورة من أجل طبقة خدمة خرائط الويب"
+
+msgid "Select WMS layers"
+msgstr "تحديد طبقات خدمة خرائط الويب"
+
+msgid "Add layers"
+msgstr "إضافة طبقات"
+
 msgid "Add Node..."
 msgstr "أضف عقدة..."
 
@@ -3297,9 +3297,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3713,10 +3710,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3753,6 +3750,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3762,6 +3762,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3798,6 +3801,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4016,6 +4025,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4226,30 +4241,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4493,9 +4508,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5020,9 +5032,6 @@ msgstr "خطّ الطول عند مؤشر الفأرة."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "الطبقة ليست في اللائحة."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6446,6 +6455,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6685,6 +6697,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7957,9 +7977,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8524,6 +8541,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8575,6 +8595,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8587,6 +8613,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10645,6 +10677,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12733,6 +12768,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "فشل إستيراد NMEA !"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13095,6 +13133,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14738,6 +14779,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14849,7 +14893,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15028,6 +15075,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15322,18 +15372,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15343,6 +15381,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15475,6 +15516,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15842,6 +15886,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15956,6 +16003,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16153,6 +16203,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16175,6 +16230,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16331,6 +16389,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17651,6 +17713,9 @@ msgstr ""
 msgid "Ford"
 msgstr "مخاضة"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19270,6 +19335,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19940,11 +20008,11 @@ msgstr "رقم النقطة"
 msgid "Point Name"
 msgstr "إسم النقطة"
 
-msgid "Phone Number"
-msgstr "رقم الهاتف"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "إستعمل رمز دولي مثل 12-345-67890"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "بيطري"
@@ -19958,6 +20026,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "رقم الهاتف"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20827,6 +20901,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20911,6 +20989,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23116,7 +23198,13 @@ msgstr "محمية طبيعية"
 msgid "Scree"
 msgstr "حصاة"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23783,16 +23871,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23801,18 +23883,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23825,18 +23895,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24029,9 +24087,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24041,6 +24110,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24056,39 +24131,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24107,9 +24167,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24164,10 +24233,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24183,7 +24258,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24228,7 +24303,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24262,6 +24337,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24280,6 +24358,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24370,10 +24451,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24619,6 +24703,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24957,3267 +25062,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "No address nodes inside buildings found"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "on polygon"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "Add address"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
-msgstr ""
-
-msgid "Select Feuille"
-msgstr ""
-
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "Align Ways"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Change the current projection"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "Length preserved"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "Angle preserved"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Align with:"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "off"
-msgstr ""
+msgid "Parameter ''{0}'' must not be null"
+msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
 
-msgid "25 m"
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "50 m"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "high"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "medium"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "low"
-msgstr "منخفض"
-
-msgid "symbol"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "parcel"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "address"
-msgstr "العنوان"
-
-msgid "locality"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "section"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "commune"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Enable automatic caching."
-msgstr "تمكين الإخباء التلقائي"
-
-msgid "Max. cache size (in MB)"
-msgstr "حجم الخابية الأقصى (م. بايت)"
-
-msgid "French cadastre WMS"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
 msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "What''s new..."
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Errr..."
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Building address"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "empty"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "skip"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "House number:"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Street:"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Post code:"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Building:"
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Tags:"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Name:"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Layers:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Parcels."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Area Selector"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Created area"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Error Report"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Custom - low resolution images"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Create buildings"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Create boundary"
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "show address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "merge nodes"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Debug"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Advanced settings"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr "حمّل الموقع من الخابية ( فقط عند تمكين الخابية)"
+msgid "Create building"
+msgstr ""
 
-msgid "{0} not allowed with the current projection"
+msgid "Set buildings size"
+msgstr ""
+
+msgid "Use Address dialog"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Buildings width:"
 msgstr ""
 
-msgid "(optional)"
+msgid "Length step:"
 msgstr ""
 
-msgid "Change location"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Commune"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Departement"
+msgid "Merge address points"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+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] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid "Reset cookie"
-msgstr "إستعادة كعكة الإنترنت"
+msgid "on polygon"
+msgstr ""
 
-msgid "Get a new cookie (session timeout)"
-msgstr "أطلب كعكة إنترنت جديدة (إنتهاء مهلة الجلسة)"
+msgid "Add address"
+msgstr ""
 
-msgid "Save image as..."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Next no"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Enter addresses"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Image cropping"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "East"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "I use the mouse"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Choose from..."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "Select commune"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Reset offset"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "Change the current projection"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "Is vectorized."
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Cache Format Error"
-msgstr "خطء في صيغة المعطيات"
+msgid "Select first WMS layer in list."
+msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "off"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "25 m"
 msgstr ""
 
-msgid "Use"
+msgid "50 m"
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "100 m"
 msgstr ""
 
-msgid "Color Scheme"
+msgid "high"
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid "medium"
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "low"
+msgstr "منخفض"
+
+msgid "symbol"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "parcel"
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "parcel number"
 msgstr ""
 
-msgid "Color Schemes"
+msgid "address"
+msgstr "العنوان"
+
+msgid "locality"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "section"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "commune"
+msgstr ""
 
-msgid "Conflation"
+msgid "Enable automatic caching."
+msgstr "تمكين الإخباء التلقائي"
+
+msgid "Max. cache size (in MB)"
+msgstr "حجم الخابية الأقصى (م. بايت)"
+
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Matches"
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Reference only"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Subject only"
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Configure"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Conflate"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Match finder method"
+msgid "Layers:"
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid "Parcels."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Layer:"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Subject"
+msgid "Municipality administrative borders."
+msgstr ""
+
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Empty selection"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Create buildings"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Image already loaded"
 msgstr ""
 
 msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "Requires restart"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Max threads"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Extra download area"
+msgid "Georeference an image"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid "Max download area"
+msgid "Georeferencing interrupted"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
-msgstr ""
+msgid "Load location from cache (only if cache is enabled)"
+msgstr "حمّل الموقع من الخابية ( فقط عند تمكين الخابية)"
 
-msgid "Split area"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
 msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Coordinates imported: "
-msgstr "الإحداثيات المستوردة: "
-
-msgid "Format errors: "
+msgid "(optional)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Change location"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download along..."
+msgid "Commune"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Download Along"
+msgid "Departement"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Add new layer"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "EditGpx"
-msgstr ""
+msgid "Reset cookie"
+msgstr "إستعادة كعكة الإنترنت"
 
-msgid "Layer for editing GPX tracks"
+msgid "Get a new cookie (session timeout)"
+msgstr "أطلب كعكة إنترنت جديدة (إنتهاء مهلة الجلسة)"
+
+msgid "Save image as..."
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Drop existing path"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Image georeferencing"
 msgstr ""
 
 msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Edit tool"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "East"
 msgstr ""
 
-msgid "External tools"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "Are you sure?"
-msgstr "هل أنت متأكد ؟"
-
-msgid "New tool..."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "Install"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Public"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "GeoChat"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Login"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Is vectorized."
+msgstr ""
 
-msgid "not logged in"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Cache Format Error"
+msgstr "خطء في صيغة المعطيات"
+
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Users mapping nearby:"
+msgid "Use"
 msgstr ""
 
-msgid "Private chat"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Close tab"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Logout"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "Clear log"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Show users on map"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Color Schemes"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflation"
 msgstr ""
 
-msgid "Position only"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Reference only"
 msgstr ""
 
-msgid "A By Time"
+msgid "Subject only"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "B By Time"
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "C By Time"
+msgid "Configure"
 msgstr ""
 
-msgid "C By Distance"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Conflate"
 msgstr ""
 
-msgid "Port:"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "Configure Device"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "Connection Error."
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "Match finder method"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Threshold distance"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "Layer:"
 msgstr ""
 
-msgid "Import"
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Subject"
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "Restore subject selection"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Empty selection"
 msgstr ""
 
-msgid "Tag without key"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max threads"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid "Extra download area"
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "Split area"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
 msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
-msgstr ""
+msgid "Coordinates imported: "
+msgstr "الإحداثيات المستوردة: "
 
-msgid "File not found:\n"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "height (m)"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "width (m)"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "length (m)"
+msgid "Download along..."
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid "weight (t)"
+msgid "Download Along"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "Access class"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "EditGpx"
 msgstr ""
 
-msgid "Access types"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "Road requirements"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "External tool error"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Error executing the script:"
 msgstr ""
 
 msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "External tools"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "default"
+msgid "Are you sure?"
+msgstr "هل أنت متأكد ؟"
+
+msgid "New tool..."
 msgstr ""
 
-msgid "end nodes"
+msgid "Install"
 msgstr ""
 
-msgid "incline"
+msgid "Public"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Parameters:"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Coloring:"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "Graphview"
+msgid "GeoChat"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "Ruleset"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "Failed to log in to GeoChat:"
+msgstr ""
+
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Select directory"
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Vehicle"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "Visualization"
+msgid "Private chat"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Close tab"
 msgstr ""
 
-msgid "Node color"
+msgid "Clear log"
 msgstr ""
 
-msgid "Arrow color"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "New bookmark"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "Position only"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Choose node color"
+msgid "A By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "A By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "B By Time"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "B By Distance"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "C By Time"
 msgstr ""
 
-msgid "graphview default node"
+msgid "C By Distance"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "Port:"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "refresh the port list"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Connection Error."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "delete data after import"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "Importing data from device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Connection failed."
 msgstr ""
 
-msgid "Calibration Layer"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Change Color"
+msgid "Import"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "GPX Data"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Class element without name"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Tag without key"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "mm"
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "cm"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "m"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "km"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "Offset Information"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Determined right here"
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Reason"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
 msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "width (m)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "length (m)"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "speed (km/h)"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "weight (t)"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "axleload (t)"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Bookmark name"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Access class"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Access types"
 msgstr ""
 
-msgid "Normal"
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Road requirements"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "Rotate 270"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Previous image"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Next image"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate image left"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Rotate right"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Imported Images"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Scale:"
+msgid "default"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "end nodes"
 msgstr ""
 
-msgid "Importing..."
+msgid "incline"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Parameters:"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Coloring:"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Graphview"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Ruleset"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "POWER"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Select directory"
 msgstr ""
 
-msgid "Working Level"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Restore defaults"
 msgstr ""
 
-msgid "Level Name"
+msgid "Visualization"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Node color"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "Fitting"
+msgid "New bookmark"
 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>"
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Lowest Level"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Choose node color"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "InfoMode"
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "GPX info mode"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+msgid "graphview default node"
 msgstr ""
 
-msgid "Delete this"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "Delete this&older"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "km/h"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
 msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "junctions"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Change Color"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
 msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
-msgstr ""
-
-msgid "create the channel digraph"
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Check "
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "Search "
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
 msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Offset"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid "mm"
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "cm"
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "km"
 msgstr ""
 
-msgid "Looking for shoreline..."
-msgstr "جاري البحث عن خط الشاطئ"
+msgid "Calibration geometries"
+msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "Lake Walker."
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Lake Walker"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
-msgstr "خطء حين إنشاء مجلد الخابية: {0}"
+msgid "Deprecated by {0} on {1}"
+msgstr ""
 
-msgid "Tracing"
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "checking cache..."
-msgstr "جاري فحص الخابية..."
+msgid "Offset Information"
+msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "Imagery ID"
 msgstr ""
 
-msgid "east"
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "northeast"
+msgid "Determined right here"
 msgstr ""
 
-msgid "north"
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "northwest"
+msgid "Reason"
 msgstr ""
 
-msgid "west"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "southwest"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "south"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "southeast"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "land"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
-msgstr "حجم الخابية الأقصى (م. بايت)"
+msgid "There are currently no imagery layer to adjust."
+msgstr ""
 
-msgid "Maximum cache age (days)"
-msgstr "عُمر الخابية الأقصى (أيام)"
+msgid "No layers to adjust"
+msgstr ""
 
-msgid "Source text"
+msgid "Normal"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate 180"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate 270"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Previous image"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "Next image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Rotate left"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Rotate image left"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Rotate right"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "Rotate image right"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr "الحجم الأقصى لكل مجلد خابية بلــبايت. الحجم الغيابي هو 300 م. بايت"
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "العُمر الأقصى لكل مجلد خابية بلــبايت. العُمر الغيابي هو 100 يوم"
+msgid "Concourse wizard ..."
+msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Structure type:"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Not connected"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Connecting"
+msgid "POWER"
 msgstr ""
 
-msgid "Connected"
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "no name"
+msgid "Working Level"
 msgstr ""
 
-msgid "Live GPS"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Level Name"
 msgstr ""
 
-msgid "Status"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Way Info"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "Speed"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Course"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Fitting"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Center Once"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "Lowest Level"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid "Highest Level"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "InfoMode"
 msgstr ""
 
-msgid "Missing input data"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Mapillary Images"
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "Delete this"
 msgstr ""
 
-msgid "Total images:"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "images"
+msgid "km/h"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Track name: "
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Export images"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Import pictures"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Import local pictures"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Select pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Join mode"
+msgid "junctions"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Upload pictures."
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Walk mode"
+msgid "Check "
 msgstr ""
 
-msgid "Start walk mode"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "Search "
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "View in website"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Copy key"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Edit on website"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Correct"
 msgstr ""
 
-msgid "Submit"
+msgid "Wrong"
 msgstr ""
 
-msgid "Export all images"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Export selected images"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Select a folder"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Explore"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Select a directory"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Speed limit"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Give way"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "No entry"
+msgid "Replace way"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Uneven road"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "No parking"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No overtaking"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Looking for shoreline..."
+msgstr "جاري البحث عن خط الشاطئ"
+
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "No turn"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "Years"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "Months"
+msgid "Error creating cache directory: {0}"
+msgstr "خطء حين إنشاء مجلد الخابية: {0}"
+
+msgid "Tracing"
 msgstr ""
 
-msgid "Days"
+msgid "checking cache..."
+msgstr "جاري فحص الخابية..."
+
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Not older than: "
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "east"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northeast"
 msgstr ""
 
-msgid "Choose signs"
+msgid "north"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "northwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "coastline"
 msgstr ""
 
-msgid "Next picture"
+msgid "land"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Play"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Pause"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Maximum cache size (MB)"
+msgstr "حجم الخابية الأقصى (م. بايت)"
+
+msgid "Maximum cache age (days)"
+msgstr "عُمر الخابية الأقصى (أيام)"
+
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr "الحجم الأقصى لكل مجلد خابية بلــبايت. الحجم الغيابي هو 300 م. بايت"
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr "العُمر الأقصى لكل مجلد خابية بلــبايت. العُمر الغيابي هو 100 يوم"
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29679,6 +29821,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "سكة حديد"
 
@@ -29774,9 +29919,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30788,6 +30930,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31235,6 +31437,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "مرّر"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32061,9 +32341,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32257,15 +32534,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "مرّر"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 48dc570..a8bc585 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2016-08-09 15:33+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: 2016-09-06 04:37+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:34+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ast\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -210,18 +210,6 @@ msgstr "Escueye nel mapa los elementos escoyíos na llista cimera."
 msgid "Add imagery layer {0}"
 msgstr "Amestar capa de imaxes {0}"
 
-msgid "Error"
-msgstr "Fallu"
-
-msgid "Select image format for WMS layer"
-msgstr "Escoyer formatu d''imaxe pa la capa WMS"
-
-msgid "Select WMS layers"
-msgstr "Escoyer capes WMS"
-
-msgid "Add layers"
-msgstr "Añader capes"
-
 msgid "Invalid service URL."
 msgstr "La URL del serviciu nun ye válida."
 
@@ -234,6 +222,18 @@ msgstr "Non se pudo recuperar la llista de les capes WMS."
 msgid "Could not parse WMS layer list."
 msgstr "Non se pudo analizar la llista de les capes WMS."
 
+msgid "Error"
+msgstr "Fallu"
+
+msgid "Select image format for WMS layer"
+msgstr "Escoyer formatu d''imaxe pa la capa WMS"
+
+msgid "Select WMS layers"
+msgstr "Escoyer capes WMS"
+
+msgid "Add layers"
+msgstr "Añader capes"
+
 msgid "Add Node..."
 msgstr "Amestar nudu..."
 
@@ -3577,9 +3577,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Nun hai capes definíes pol documentu getCapabilities: {0}"
 
-msgid "No layer selected"
-msgstr "Nun se seleicionó nenguna capa"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4018,12 +4015,12 @@ msgstr "Múltiples asociaciones de relaciones de cai"
 msgid "House number without street"
 msgstr "Númberu de casa ensin una calle"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Númberu de portal ''{0}'' dobláu"
-
 msgid "Duplicate house numbers"
 msgstr "Númberos de portal doblaos"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Númberu de portal ''{0}'' dobláu"
+
 msgid "Multiple street names in relation"
 msgstr "Munchos nomes de cais na relación"
 
@@ -4060,6 +4057,10 @@ msgstr "Llínees de mariña"
 msgid "This test checks that coastlines are correct."
 msgstr "Esti test comprueba si les mariñes tán correctes."
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+"Llínea de mariña invertía: la tierra nun puede asitiase al llau esquierdu"
+
 msgid "Unconnected coastline"
 msgstr "Llínea de mariña ensin conectar"
 
@@ -4069,6 +4070,9 @@ msgstr "Llínea de mariña desordenada"
 msgid "Reversed coastline"
 msgstr "Llínea de mariña invertía"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "Claves Condicionales"
 
@@ -4105,6 +4109,12 @@ msgstr "Cruciando llendes"
 msgid "Crossing barriers"
 msgstr "Cruciando barreres"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4339,6 +4349,12 @@ msgstr "El miembru de multipolígonu non tien un rol útil"
 msgid "Non-Way in multipolygon"
 msgstr "Non hai vía dientro del multipolígonu"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Nome que falta:* traducción"
 
@@ -4568,30 +4584,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Los valores de propiedá contienen entidá de HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
-msgstr "La clave ''{0}\" non esiste nos predefiníos"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr "Esta clave non tá predefinía"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "El valor ''{0}'' pa la clave ''{1}'' paezse a ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "La clave ''{0}\" non esiste nos predefiníos"
 
 msgid "Misspelled property value"
 msgstr "Valor de propiedá mal escritu"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "El valor \"{0}\" pa la clave \"{1}\" non tá nos predefiníos."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "El valor ''{0}'' pa la clave ''{1}'' paezse a ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Los predefiníos non contienen valores apropiaos"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "El valor \"{0}\" pa la clave \"{1}\" non tá nos predefiníos."
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4844,10 +4860,6 @@ msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 "Esti test comprueba la direición de víes fluviales, terrestres y de mariña."
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-"Llínea de mariña invertía: la tierra nun puede asitiase al llau esquierdu"
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 "Llínea terrestre invertía: la tierra nun puede asitiase al llau esquierdu"
@@ -5409,9 +5421,6 @@ msgstr "La llonxitú xeográfica nel punteru del mure."
 msgid "System of measurement changed to {0}"
 msgstr "El sistema de midida camudó a {0}"
 
-msgid "Layer not in list."
-msgstr "la capa no ta na llista"
-
 msgid "Default (open, closed, new)"
 msgstr "Predeterminao (abierta, zarrada, nueva)"
 
@@ -6952,6 +6961,9 @@ msgstr "Ordenar notes"
 msgid "Sort"
 msgstr "Axeitar"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Triba d''oxetu:"
 
@@ -7204,6 +7216,14 @@ msgstr "Descarga''l conteníu de les modificaciones"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Descarga''l conteníu de los cambeos escoyíos dende''l servidor"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Los mios cambeos"
 
@@ -8602,9 +8622,6 @@ msgstr "Introduza''l nome d''un llugar que buscar"
 msgid "Areas around places"
 msgstr "Árees en redol a llugares"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Esceición de punteru nula, posiblemente dalguna etiqueta tea perdida"
-
 msgid "Search ..."
 msgstr "Buscar..."
 
@@ -9251,6 +9268,9 @@ msgstr "Cambeos ensin guardar. ¿Guardalos/xubilos enantes de salir?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Cambeos ensin guardar. ¿Guardalos/xubilos enantes de borrar?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Xubiendo y grabando les capes modificaes..."
 
@@ -9318,6 +9338,12 @@ msgstr "¡Colar agora!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Colar de JOSM ensin guardar. Los cambeos ensin grabar van perdese."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "¡Esaniciar agora!"
 
@@ -9332,6 +9358,12 @@ msgstr ""
 "Salir de JOSM en guardando. Los cambeos ensin grabar van xubise y/o van "
 "guardase."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Realizar acciones enantes d''esaniciar"
 
@@ -11658,6 +11690,9 @@ msgstr "Dibuxa fleches de sentíu únicu."
 msgid "Draw segment order numbers"
 msgstr "Dibuxar los númberos d''orde de los segmentos"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibuxar les llendes de los datos descargaos"
 
@@ -13966,6 +14001,9 @@ msgstr "Ésitu na importación NMEA:"
 msgid "NMEA import failure!"
 msgstr "¡Fallu na importación NMEA!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Esceición de punteru nula, posiblemente dalguna etiqueta tea perdida"
+
 msgid "Note Files"
 msgstr "Arquivos de Notes"
 
@@ -14368,6 +14406,9 @@ msgstr "Xubiendo datos..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Atopóse un ID 0 inesperáu pa la primitiva osm"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "Descargando datos..."
 
@@ -16261,6 +16302,9 @@ msgstr "Tiris: DGM (Modelu del Terrén)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Modelu de Superficie)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (propósitu xeneral)"
 
@@ -16372,7 +16416,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -16554,6 +16601,9 @@ msgstr "Drone Imagery 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16848,18 +16898,6 @@ msgstr "Freemap.sk Cyclo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Ski"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakia Historic Maps"
 
@@ -16869,6 +16907,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
@@ -17001,6 +17042,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -17393,6 +17437,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Descargar datos OSM cercanos a una vía"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17534,6 +17581,9 @@ msgstr ""
 "de carreteres de OSM. El componente nun funcionar colos datos de OSM "
 "orixinales, sinón qu''estos se tresformen nuna canal de digrafos."
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Ayuda a vectorizar imaxes d''un serviciu WMS"
 
@@ -17775,6 +17825,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17804,6 +17859,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Complementu pa roblar dixitalmente datos OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17974,6 +18032,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "campu de xuegu"
 
@@ -19296,6 +19358,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Vau"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Víes"
 
@@ -20938,6 +21003,9 @@ msgstr "Pista"
 msgid "Taxiway"
 msgstr "Pista de rodaxe"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Pista d''aterrizaxe d''helicópteros"
 
@@ -21608,11 +21676,11 @@ msgstr "Númberu de puntu"
 msgid "Point Name"
 msgstr "Nome del puntu"
 
-msgid "Phone Number"
-msgstr "Númberu de teléfonu"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Utilizar códigu internacional, como +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinariu"
@@ -21626,6 +21694,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr "Desfibrilador automáticu"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Númberu de teléfonu"
+
 msgid "Located inside a building?"
 msgstr "¿Allugáu dientro d''un edificiu?"
 
@@ -22497,6 +22571,10 @@ msgid "university"
 msgstr "universidá"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "hospital"
 
@@ -22581,6 +22659,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -24799,8 +24881,14 @@ msgstr "Reserva natural"
 msgid "Scree"
 msgstr "Pedregal"
 
-msgid "An accumulation of loose rocks."
-msgstr "Una acumuladura de roques sueltes."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "Braña"
@@ -25479,17 +25567,11 @@ msgstr "Rutes"
 msgid "Bicycle Route"
 msgstr "Ruta de ciclismu"
 
-msgid "icn"
-msgstr "icn"
-
-msgid "ncn"
-msgstr "ncn"
-
-msgid "rcn"
-msgstr "rcn"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "lcn"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Ruta de ciclismu de monte"
@@ -25497,18 +25579,6 @@ msgstr "Ruta de ciclismu de monte"
 msgid "Hiking Route"
 msgstr "Ruta de senderismo"
 
-msgid "iwn"
-msgstr "iwn"
-
-msgid "nwn"
-msgstr "nwn"
-
-msgid "rwn"
-msgstr "rwn"
-
-msgid "lwn"
-msgstr "lwn"
-
 msgid "infrastructure"
 msgstr "infraestructura"
 
@@ -25521,18 +25591,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr "Ruta de pista"
 
@@ -25725,9 +25783,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr "{0} ensin {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} ensin {1} o {2}"
 
@@ -25737,6 +25806,12 @@ msgstr "{0} ensin {1}, {2} o {3}"
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -25752,39 +25827,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr "{0} n´oxetu sospechosu"
 
-msgid "restaurant without name"
-msgstr "restaurant ensin name"
-
-msgid "{0} used with {1}"
-msgstr "{0} utilizar con {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "llagu/llaguna utilizáu como piscina"
 
 msgid "sport without physical feature"
 msgstr "deporte ensin elementu físicu"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} tendría de tar nel nodo onde {1} y {2} s´intersecten"
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25803,9 +25863,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} ta obsoleto"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' nun tien sentíu. Utilice etiquetes más específiques, por casu ''{1}''"
@@ -25864,10 +25933,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -25883,7 +25958,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25928,7 +26003,7 @@ msgstr "Árees naturales idéntiques superpuestes"
 msgid "Overlapping Identical Landuses"
 msgstr "Usos del suelu idénticos superpuestos"
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -25962,6 +26037,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} tendría de tar nel nodo onde {1} y {2} s´intersecten"
+
 msgid "abbreviated street name"
 msgstr "nome de cai embrivíu"
 
@@ -25980,6 +26058,9 @@ msgstr "carretera ensin una referencia"
 msgid "temporary highway type"
 msgstr "tipu de carretera d''usu temporal"
 
+msgid "{0} used with {1}"
+msgstr "{0} utilizar con {1}"
+
 msgid "street name contains ss"
 msgstr "nome de cai contien ss"
 
@@ -26073,11 +26154,14 @@ msgstr "denominación de xudíu desconocía"
 msgid "{0} is unnecessary"
 msgstr "{0} nun ye necesariu"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} nun ye necesariu pa {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} nun tien sentíu"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Nodos que doblen les etiquetes de les víes padre"
@@ -26340,6 +26424,27 @@ msgstr "Xubiendo traza GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Traces xubíes a openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importando..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "Por favor abra o cree una capa de datos antes de la importación"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Escala:"
+
+msgid "unit(s) = "
+msgstr "Unidá(es) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Amuesa''l perfil d''elevación"
 
@@ -26696,6 +26801,403 @@ 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 "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr ""
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start 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 "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr "Aniciar sesión"
+
+msgid "Logout"
+msgstr "Pesllar sesión"
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28547,9 +29049,6 @@ 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"
 
@@ -28582,9 +29081,6 @@ msgstr "Conversación privada"
 msgid "Close tab"
 msgstr "Pesllar pestaña"
 
-msgid "Logout"
-msgstr "Pesllar sesión"
-
 msgid "Clear log"
 msgstr "Llimpiar rexistru"
 
@@ -29173,9 +29669,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29369,21 +29862,9 @@ msgstr "Imaxes importaes"
 msgid "Import vector graphics"
 msgstr "Importar gráficos vectoriales"
 
-msgid "Scale:"
-msgstr "Escala:"
-
-msgid "unit(s) = "
-msgstr "Unidá(es) = "
-
-msgid "Importing..."
-msgstr "Importando..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "Arquivos SVG [complementu ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Por favor abra o cree una capa de datos antes de la importación"
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29598,6 +30079,61 @@ msgstr "Númberu de cruces de {0}-víes atopaos: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "xenerar toles combinaciones de candidatos pa entrada y salida"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Reemplazar xeometría"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Índiz de dirección ''{0}'' non atopáu"
 
@@ -29856,400 +30392,6 @@ msgstr "Activar el complementu d''informes d''erru de MapDust"
 msgid "Missing input data"
 msgstr "Falten datos d''entrada"
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start 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 "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Valores midíos"
 
@@ -31805,6 +31947,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "Movíu"
+
 msgid "rail"
 msgstr "fierrocarril"
 
@@ -31902,9 +32047,6 @@ msgstr "Prindar"
 msgid "Join"
 msgstr "Xunir"
 
-msgid "moved"
-msgstr "Movíu"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Tresporte públicu: xunir paraes GTFS"
 
@@ -32967,6 +33109,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terrace"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -33440,6 +33642,84 @@ msgstr "Escueya una fecha de expiración pa la llave:"
 msgid "Create a new signing key"
 msgstr "Crear una nueva clave de firma"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Alantre"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Escontra tras"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Nun hai tal carril."
 
@@ -34399,9 +34679,6 @@ msgstr "Atopáronse primitives con estes etiquetes"
 msgid "Multitag Background: highlight"
 msgstr "Multietiquetáu de fondu: visible"
 
-msgid "Replace Geometry"
-msgstr "Reemplazar xeometría"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Reemplace la xeometría del oxetu escoyíu con una nueva"
 
@@ -34615,15 +34892,9 @@ msgstr "Empecipiar/pausar la reproducción del vídeu"
 msgid "Video: {0}"
 msgstr "Vídeu: {0}"
 
-msgid "Backward"
-msgstr "Escontra tras"
-
 msgid "jumps n sec back"
 msgstr "ir n segundos p''atrás"
 
-msgid "Forward"
-msgstr "Alantre"
-
 msgid "jumps n sec forward"
 msgstr "salta n segundos alantre"
 
diff --git a/i18n/po/az.po b/i18n/po/az.po
index fe290df..4f3ba5e 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2013-01-12 17:56+0000\n"
 "Last-Translator: iAZISS <iss-sash at mail.ru>\n"
 "Language-Team: Azerbaijani <az at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:38+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:34+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -203,28 +203,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3277,9 +3277,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3681,10 +3678,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3721,6 +3718,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3730,6 +3730,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3766,6 +3769,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3984,6 +3993,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4194,30 +4209,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4461,9 +4476,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4984,9 +4996,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6406,6 +6415,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6645,6 +6657,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7917,9 +7937,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8483,6 +8500,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8534,6 +8554,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8546,6 +8572,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10599,6 +10631,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12680,6 +12715,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13042,6 +13080,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14685,6 +14726,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14796,7 +14840,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14975,6 +15022,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15269,18 +15319,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15290,6 +15328,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15422,6 +15463,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15789,6 +15833,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15903,6 +15950,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16100,6 +16150,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16122,6 +16177,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16278,6 +16336,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17598,6 +17660,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19217,6 +19282,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19887,10 +19955,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19905,6 +19973,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20774,6 +20848,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20858,6 +20936,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23063,7 +23145,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23730,16 +23818,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23748,18 +23830,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23772,18 +23842,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23976,9 +24034,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23988,6 +24057,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24003,39 +24078,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24054,9 +24114,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24111,10 +24180,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24130,7 +24205,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24175,7 +24250,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24209,6 +24284,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24227,6 +24305,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24317,10 +24398,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24566,6 +24650,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24904,3267 +25009,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29626,6 +29768,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29721,9 +29866,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30735,6 +30877,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31182,6 +31384,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32008,9 +32288,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32204,15 +32481,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 67f92b7..1a1d754 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-09-05 12:49+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-09-21 19:41+0000\n"
 "Last-Translator: Viktar Palstsiuk <Unknown>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:39+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: be\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -217,18 +217,6 @@ msgstr "Вылучыць на карце аб’екты, абраныя ў сп
 msgid "Add imagery layer {0}"
 msgstr "Дадаць пласт здымка {0}"
 
-msgid "Error"
-msgstr "Памылка"
-
-msgid "Select image format for WMS layer"
-msgstr "Выберыце фармат малюнка для WMS пласта"
-
-msgid "Select WMS layers"
-msgstr "Выбраць WMS пласт"
-
-msgid "Add layers"
-msgstr "Дадаць пласт"
-
 msgid "Invalid service URL."
 msgstr "Няправільная спасылка сэрвісу WMS"
 
@@ -241,6 +229,18 @@ msgstr "Немагчыма атрымаць спіс пластоў WMS"
 msgid "Could not parse WMS layer list."
 msgstr "Немагчыма разабраць спіс пластоў WMS."
 
+msgid "Error"
+msgstr "Памылка"
+
+msgid "Select image format for WMS layer"
+msgstr "Выберыце фармат малюнка для WMS пласта"
+
+msgid "Select WMS layers"
+msgstr "Выбраць WMS пласт"
+
+msgid "Add layers"
+msgstr "Дадаць пласт"
+
 msgid "Add Node..."
 msgstr "Дадаць ноду..."
 
@@ -3622,9 +3622,6 @@ msgstr "Ідэнтыфікатар набору матрыц"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Не вызначана ні аднаго пласта праз getCapabilities дакмент: {0}"
 
-msgid "No layer selected"
-msgstr "Пласт не абраны"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4054,12 +4051,12 @@ msgstr "Некалькі дачыненняў associatedStreet"
 msgid "House number without street"
 msgstr "Нумар хаты без указання вуліцы"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Дубляваны нумар дома «{0}»"
-
 msgid "Duplicate house numbers"
 msgstr "Дубляваць нумары дамоў"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Дубляваны нумар дома «{0}»"
+
 msgid "Multiple street names in relation"
 msgstr "Некалькі назваў вуліц у дачыненні"
 
@@ -4095,6 +4092,9 @@ msgstr "Берагавыя лініі"
 msgid "This test checks that coastlines are correct."
 msgstr "Гэты тэст правярае правільнасць берагавых ліній."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Няслушны кірунак берагавой лініі: зямля не злева"
+
 msgid "Unconnected coastline"
 msgstr "Нязлучаная берагавая лінія"
 
@@ -4104,6 +4104,9 @@ msgstr "Неўпарадкаваная берагавая лінія"
 msgid "Reversed coastline"
 msgstr "Зваротная берагавая лінія"
 
+msgid "invalid coastline"
+msgstr "Няправільная берагавая лінія"
+
 msgid "Conditional Keys"
 msgstr "Ключы, якія залежаць ад умоў"
 
@@ -4140,6 +4143,12 @@ msgstr "Перасякальныя межы"
 msgid "Crossing barriers"
 msgstr "Скрыжаванне бар’ераў"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4379,6 +4388,12 @@ msgstr "Роля для ўдзельніка мультыпалігона зад
 msgid "Non-Way in multipolygon"
 msgstr "Ня-лінія ў мультыпалігоне"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Адсутны  пераклад name:*"
 
@@ -4601,30 +4616,30 @@ msgstr "Значэнні ўтрымоўваюць некалькі прабел
 msgid "Property values contain HTML entity"
 msgstr "Значэнні ўтрымоўваюць HTML разметку"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Ключ ''{0}'' падобны да ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Арфаграфічная памылка ў ключы ўласцівасці"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Ключа ''{0}'' няма ў нарыхтоўках."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Ключ ''{0}'' падобны да ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Нарыхтоўкі не ўтрымліваюць падыходзячага ключа"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Значэнне ''{0}'' ключа ''{1}'' выглядае падобным на ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Ключа ''{0}'' няма ў нарыхтоўках."
 
 msgid "Misspelled property value"
 msgstr "Памылка друку ў значэнні"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Значэння ''{0}'' для ключа ''{1}'' няма ў нарыхтоўках"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Значэнне ''{0}'' ключа ''{1}'' выглядае падобным на ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "У нарыхтоўках няма адпаведнага значэння"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Значэння ''{0}'' для ключа ''{1}'' няма ў нарыхтоўках"
+
 msgid "FIXMES"
 msgstr "Тэгі FIXME (да выпраўлення)"
 
@@ -4874,9 +4889,6 @@ msgstr "Няправільна спарадкаваныя лініі"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Гэты тэст правярае кірунак берагавых ліній."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Няслушны кірунак берагавой лініі: зямля не злева"
-
 msgid "Reversed land: land not on left side"
 msgstr "Няслушны кірунак лініі сушы: зямля не злева"
 
@@ -5439,9 +5451,6 @@ msgstr "Геаграфічная даўгата становішча курсо
 msgid "System of measurement changed to {0}"
 msgstr "Сістэма вымярэнняў зменена на {0}"
 
-msgid "Layer not in list."
-msgstr "Пласт не ў спісе."
-
 msgid "Default (open, closed, new)"
 msgstr "Па змаўчанні (адкрытыя, зачыненыя, новыя)"
 
@@ -7010,6 +7019,9 @@ msgstr "Сартаваць нататкі"
 msgid "Sort"
 msgstr "Сартаваць"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Тып аб’екта"
 
@@ -7259,6 +7271,14 @@ msgstr "Запампаваць з сервера змесціва пакета 
 msgid "Download the content of the selected changesets from the server"
 msgstr "Запампаваць з сервера змесціва вылучаных пакетаў правак"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Мае пакеты правак"
 
@@ -8664,9 +8684,6 @@ msgstr "Увядзіце назву месца для пошуку"
 msgid "Areas around places"
 msgstr "Вобласці вакол месцаў"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Пусты паказальнік памылкі, магчыма, ёсць адсутныя тэгі"
-
 msgid "Search ..."
 msgstr "Знайсці ..."
 
@@ -9319,6 +9336,9 @@ msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 "Незахаваныя змены - Захаваць лакальна ці перадаць на сервер перад выдаленнем?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Перадача на сервер і захаванне змененых пластоў ..."
 
@@ -9396,6 +9416,12 @@ msgstr "Выйсці цяпер!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Выйсці з  JOSM без захавання. Незахаваныя змены будуць згублены."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Выдаліць цяпер!"
 
@@ -9410,6 +9436,12 @@ msgstr ""
 "Выхад з JOSM з захаваннем. Незахаваныя змены будуць захаваныя лакальна або "
 "загружаныя на сервер."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Выканаць дзеянні перад выдаленнем"
 
@@ -11740,6 +11772,9 @@ msgstr "Адлюстроўваць стрэлкі аднабаковага ру
 msgid "Draw segment order numbers"
 msgstr "Адлюстроўваць парадкавыя нумары сегментаў"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Адлюстроўваць межы запампаваных дадзеных"
 
@@ -14036,6 +14071,9 @@ msgstr "Паспяховы імпарт NMEA дадзеных:"
 msgid "NMEA import failure!"
 msgstr "Збой пры імпарце NMEA!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Пусты паказальнік памылкі, магчыма, ёсць адсутныя тэгі"
+
 msgid "Note Files"
 msgstr "Файлы нататак"
 
@@ -14437,6 +14475,9 @@ msgstr "Перадача дадзеных на сервер ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Выяўлены нечаканы id 0 для элемента osm"
 
+msgid "Failed to evaluate {0}"
+msgstr "Не атрымалася выканаць {0}"
+
 msgid "Downloading data..."
 msgstr "Спампоўка дадзеных..."
 
@@ -16394,6 +16435,9 @@ msgstr "Tiris: DGM (мадэль рэльефу)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (мадэль паверхні)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Вена: шматмэтавая карта (агульнага прызначэння)"
 
@@ -16505,8 +16549,11 @@ msgstr "Geodatastyrelsen: кадастравыя ўчасткі па INSPIRE"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Геададзеныя агенцтва DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Агенцтва геададзеных Skyggekort 1.6 м"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Геададзеныя агенцтва Skærmkort"
@@ -16684,6 +16731,9 @@ msgstr "Здымкі з дрону 2014 (Гаіці)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Canaan (Гаіці) - здымка з дрона, лістапад 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI артафота 2000"
 
@@ -16979,18 +17029,6 @@ msgstr "Freemap.sk Веласіпедная"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Лыжная"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Кадастравая карта Славакіі (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Кадастравая карта Славакіі (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Славакія EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Славакія EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Славакія: гістарычныя карты"
 
@@ -17000,6 +17038,9 @@ msgstr "RABA-KGZ: Славенія - выкарыстанне сельгасзя
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Славенія - вобласці забудовы"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "Кейптаўн, аэрафотаздымка 2015"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Паўднёвая Афрыка CD: NGI аэрафотаздымкі"
 
@@ -17133,6 +17174,9 @@ msgstr "U.S. Forest Service - дарогі"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Украіна - артафота 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Украіна - Кіеў 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "7-я серыя (OS7)"
 
@@ -17531,6 +17575,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Загрузка дадзеных OSM ўздоўж лініі"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17679,6 +17726,9 @@ msgstr ""
 "стварае арграф і правярае падмноства каналаў на тое, ці з''яўляюцца яны "
 "развязкамі, або шукае ў падмноствах каналаў развязкі"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Дапамагае вектарызаваць выявы WMS."
 
@@ -17930,6 +17980,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Зрабіць шэраг дамоў уздоўж вуліцы з аднаго блока."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17961,6 +18016,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Модуль для лічбавага подпісу дадзеных OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18131,6 +18189,10 @@ msgid "No wheeled vehicle"
 msgstr "Непраходна ні для якой колавай тэхнікі"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "спартовае поле"
 
@@ -19459,6 +19521,9 @@ msgstr "будаўніцтва"
 msgid "Ford"
 msgstr "Брод"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Лініі"
 
@@ -21101,6 +21166,9 @@ msgstr "Узлётна-пасадкавая паласа"
 msgid "Taxiway"
 msgstr "Рулёжная дарожка"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Верталётная пляцоўка"
 
@@ -21771,11 +21839,11 @@ msgstr "Нумар пункта"
 msgid "Point Name"
 msgstr "Назва пункта"
 
-msgid "Phone Number"
-msgstr "Нумар тэлефона"
+msgid "Emergency Phone Number"
+msgstr "Тэлефон экстранай службы"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Выкарыстоўвайце міжнародны код, напрыклад: +7-916-0857403)"
+msgid "(Use number as shown on plate.)"
+msgstr "(Увядзіце нумар так, як ён паказаны на таблічцы.)"
 
 msgid "Veterinary"
 msgstr "Ветэрынарыя"
@@ -21789,6 +21857,12 @@ msgstr "Станцыя хуткай дапамогі"
 msgid "Automated Defibrillator"
 msgstr "Аўтаматызаваны дэфібрылятар"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Нумар тэлефона"
+
 msgid "Located inside a building?"
 msgstr "Размешчаны ўсярэдзіне будынка?"
 
@@ -22658,6 +22732,10 @@ msgid "university"
 msgstr "універсітэт"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "лякарня"
 
@@ -22742,6 +22820,10 @@ msgid "public"
 msgstr "грамадскі"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "руіны"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Паверхі"
 
@@ -24954,8 +25036,14 @@ msgstr "Запаведнік"
 msgid "Scree"
 msgstr "Асыпак"
 
-msgid "An accumulation of loose rocks."
-msgstr "Навала абломкаў горных парод, што абсыпаюцца ў выніку выветрывання."
+msgid "An accumulation of loose angular rocks."
+msgstr "Скупнасць вуглаватых камянёў ці абломкаў горных парод."
+
+msgid "Shingle"
+msgstr "Галька"
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr "Скупнасць скругленых камянёў на пляжы ці берагу ракі."
 
 msgid "Fell"
 msgstr "Фіельды"
@@ -25635,17 +25723,11 @@ msgstr "Маршруты"
 msgid "Bicycle Route"
 msgstr "Веласіпедны маршрут"
 
-msgid "icn"
-msgstr "міжнародная"
-
-msgid "ncn"
-msgstr "нацыянальная"
-
-msgid "rcn"
-msgstr "рэгіянальная"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "мясцовая"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Маршрут горных ровараў"
@@ -25653,18 +25735,6 @@ msgstr "Маршрут горных ровараў"
 msgid "Hiking Route"
 msgstr "Пешы турыстычны маршрут"
 
-msgid "iwn"
-msgstr "міжнародная"
-
-msgid "nwn"
-msgstr "нацыянальная"
-
-msgid "rwn"
-msgstr "рэгіянальная"
-
-msgid "lwn"
-msgstr "мясцовая"
-
 msgid "infrastructure"
 msgstr "інфраструктура"
 
@@ -25677,18 +25747,6 @@ msgstr "Пешы маршрут"
 msgid "Riding Route"
 msgstr "Конны маршрут"
 
-msgid "ihn"
-msgstr "міжнародная (ihn)"
-
-msgid "nhn"
-msgstr "нацыянальная (nhn)"
-
-msgid "rhn"
-msgstr "рэгіянальная (rhn)"
-
-msgid "lhn"
-msgstr "лакальная (lhn)"
-
 msgid "Piste Route"
 msgstr "Гарналыжны маршрут"
 
@@ -25881,9 +25939,20 @@ msgstr "Няцотны нумар дома ў інтэрпаляцыі цотн
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr "Лінія з {0}. Па магчымасці адзначце кожны нумар дома асобна."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr "Аднолькавае значэнне {0} і {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} без {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} без {1} ці {2}"
 
@@ -25893,6 +25962,12 @@ msgstr "{0} без {1}, {2} ці {3}"
 msgid "{0} together with {1}"
 msgstr "{0} разам з {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "няпоўны аб`ект: толькі {0}"
 
@@ -25908,39 +25983,24 @@ msgstr "{0} разам з {1} і супярэчлівымі значэннямі
 msgid "{0} on suspicious object"
 msgstr "{0} на падазроным аб’екце"
 
-msgid "restaurant without name"
-msgstr "тэг restaurant без тэга name"
-
-msgid "{0} used with {1}"
-msgstr "{0} скарыстаны з {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "тэг natural water дададзены для плавальнага басейна"
 
 msgid "sport without physical feature"
 msgstr "тэг sport без фізічнага аб’екта"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} павінен быць пунктам скрыжавання {1} і {2}"
-
 msgid "alternative name without {0}"
 msgstr "альтэрнатыўная назва без {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "няпоўнае выкарыстанне {0} для лініі без {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Аднолькавае значэнне {0} і {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Аднолькавае значэнне {0}, {1} і {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} і {1} разам з {2} і значэннямі, якія канфліктуюць"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Падазронае спалучэнне тэгаў: {0} і {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} на дачыненні без {1}"
 
@@ -25965,9 +26025,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} разам з {1} і {2}. Выдаліце {1} і {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Розны лік палос руху ў ключах {0} і {1}"
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} састарэлы"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' невыразны, выкарыстоўвайце больш характэрныя тэгі, напрыклад, ''{1}''"
@@ -26039,12 +26108,18 @@ msgstr "Незразумелы тэг {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Недакладнае вызначэнне {0}"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} не рэкамендуецца. Выкарыстоўвайце функцыю «Змяніць кірунак лініі» з меню "
 "«Прылады»."
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "ключ з незвычайным знакам"
 
@@ -26060,8 +26135,8 @@ msgstr "{0} не рэкамендуецца для {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} ужываць не рэкамендуецца. Выкарыстоўвайце наўзамен прэфікс {1}:"
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "сумнеўны ключ (сканчаецца лікам): {0}"
+msgid "questionable key (ending with a number)"
+msgstr ""
 
 msgid "The key {0} has an uncommon value."
 msgstr "Ключ {0} мае незвычайнае значэнне."
@@ -26105,8 +26180,8 @@ msgstr "Перакрыцце ідэнтычных прыродных участ
 msgid "Overlapping Identical Landuses"
 msgstr "Перакрыцце ідэнтычных участкаў землекарыстання"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} павінен быць злучаны з лініяй"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "пункт злучае водны шлях і мост"
@@ -26143,6 +26218,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Берагавая лінія ўнутры {1}"
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} павінен быць пунктам скрыжавання {1} і {2}"
+
 msgid "abbreviated street name"
 msgstr "скарочанае пазначэнне вуліцы"
 
@@ -26161,6 +26239,9 @@ msgstr "тэг highway без пазначэння (ref)"
 msgid "temporary highway type"
 msgstr "часовы тып дарогі"
 
+msgid "{0} used with {1}"
+msgstr "{0} скарыстаны з {1}"
+
 msgid "street name contains ss"
 msgstr "назва вуліцы ўтрымоўвае ss"
 
@@ -26259,11 +26340,14 @@ msgstr "невядомая канфесія юдаізму"
 msgid "{0} is unnecessary"
 msgstr "{0} не патрэбен"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} не трэба для {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} не мае сэнсу"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Кропкі з тэгамі як у бацькоўскай лініі"
@@ -26525,6 +26609,27 @@ msgstr "Перадача GPX трэка на сервер"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Перадача трэкаў на сайт openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Імпартаванне..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "Адкрыйце ці стварыце пласт дадзеных перад імпартам"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Маштаб:"
+
+msgid "unit(s) = "
+msgstr "адзінкі = "
+
+msgid "m"
+msgstr "м"
+
 msgid "Shows elevation profile"
 msgstr "Паказвае профіль вышыні"
 
@@ -26879,6 +26984,410 @@ msgstr "Імпартаваць выяву, прывязаную да каард
 msgid "Error while creating image layer: "
 msgstr "Памылка пры стварэнні пласта з малюнкам: "
 
+msgid "Mapillary Images"
+msgstr "Здымкі Mapillary"
+
+msgid "Mapillary layer"
+msgstr "Mapillary"
+
+msgid "Total images:"
+msgstr "Усяго здымкаў:"
+
+msgid "images"
+msgstr "здымкі"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "Шрыфт дарожнага знака ў ''{0}'' мае няправільны фармат"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Не атрымалася прачытаць файл шрыфта з ''{0}''"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Стварыць пласт Mapillary"
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr "Выберыце выявы"
+
+msgid "Import pictures into sequence"
+msgstr "Імпартаваць выявы ў паслядоўнасць"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Імпартаваць выявы ў паслядоўнасць у пласце Mapillary"
+
+msgid "Join mode"
+msgstr "Рэжым злучэння"
+
+msgid "Join/unjoin pictures"
+msgstr "Злучыць/раз''яднаць выявы"
+
+msgid "Join Mapillary pictures"
+msgstr "Злучыць выявы Mapillary"
+
+msgid "Submit changeset"
+msgstr "Перадаць пакет правак"
+
+msgid "Submit the current changeset"
+msgstr "Перадаць бягучы пакет правак"
+
+msgid "Submit the current changeset to Mapillary"
+msgstr "Перадаць бягучы пакет правак у Mapillary"
+
+msgid "Upload pictures"
+msgstr "Адаслаць выявы"
+
+msgid "Upload Mapillary pictures"
+msgstr "Адаслаць выявы Mapillary"
+
+msgid "Upload pictures."
+msgstr "Адаслаць выявы."
+
+msgid "Walk mode"
+msgstr "Пешаходны рэжым"
+
+msgid "Start walk mode"
+msgstr "Пачаць пешаходны рэжым"
+
+msgid "Zoom to selected image"
+msgstr "Маштабаваць да вылучанага здымка"
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr "Наблізіцца да бягучага вылучанага здымка Mapillary"
+
+msgid "View in website"
+msgstr "Паглядзець на вэб-сайце"
+
+msgid "Copy key"
+msgstr "Капіяваць ключ"
+
+msgid "Copy key tag"
+msgstr "Капіяваць тэг"
+
+msgid "Edit on website"
+msgstr "Рэдагаваць на сайце"
+
+msgid "Current Mapillary changeset"
+msgstr "Бягучы пакет правак Mapillary"
+
+msgid "Open Mapillary changeset dialog"
+msgstr "Адкрыць дыялог набору змен Mapillary"
+
+msgid "Mapillary changeset"
+msgstr "Пакет правак Mapillary"
+
+msgid "Submit"
+msgstr "Адправіць"
+
+msgid "Export all images"
+msgstr "Экспартаваць ўсе здымкі"
+
+msgid "Export selected sequence"
+msgstr "Экспартаваць выбраную паслядоўнасць"
+
+msgid "Export selected images"
+msgstr "Экспартаваць выдзеленыя здымкі"
+
+msgid "Rewrite imported images"
+msgstr "Перазапісаць імпартаваныя выявы"
+
+msgid "Select a folder"
+msgstr "Абярыце каталог"
+
+msgid "Explore"
+msgstr "Агляд"
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr "Здымак Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Адкрыць акно Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Дыялог Mapillary"
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr "Увайсці"
+
+msgid "Logout"
+msgstr "Выйсці"
+
+msgid "Download mode"
+msgstr "Рэжым спампоўкі"
+
+msgid "You are logged in as ''{0}''."
+msgstr "Вы ўвайшлі як ''{0}''."
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr "усё ў бачнай вобласці"
+
+msgid "areas with downloaded OSM-data"
+msgstr "вобласці са спампаванымі дадзенымі OSM"
+
+msgid "only when manually requested"
+msgstr "толькі пры запыце ўручную"
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+"Спампаваная вобласць OSM занадта вялікая. Рэжым загрузкі зменены на вобласць "
+"са спампаванымі дадзенымі OSM да наступнага перазапуску пласта."
+
+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 ""
+
+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 "The image key ''{0}'' is invalid!"
+msgstr "Няслушны ідэнтыфікатар малюнка ''{0}''!"
+
+msgid "The image key must not be null here!"
+msgstr "Ідэнтыфікатар малюнка тут не павінен мець значэнне null!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "Няслушны ідэнтыфікатар паслядоўнасці ''{0}''!"
+
+msgid "The sequence key must not be null here!"
+msgstr "Ідэнтыфікатар паслядоўнасці тут не павінен мець значэнне null!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28744,9 +29253,6 @@ msgstr "Адкрыць панэль GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Наблізьце, каб убачыць паведамленні"
 
-msgid "Login"
-msgstr "Увайсці"
-
 msgid "Enable autologin"
 msgstr "Уваходзіць аўтаматычна"
 
@@ -28780,9 +29286,6 @@ msgstr "Прыватны чат"
 msgid "Close tab"
 msgstr "Зачыніць укладку"
 
-msgid "Logout"
-msgstr "Выйсці"
-
 msgid "Clear log"
 msgstr "Ачысціць часопіс"
 
@@ -29360,9 +29863,6 @@ msgstr "мм"
 msgid "cm"
 msgstr "см"
 
-msgid "m"
-msgstr "м"
-
 msgid "km"
 msgstr "км"
 
@@ -29549,21 +30049,9 @@ msgstr "Імпартаваныя малюнкі"
 msgid "Import vector graphics"
 msgstr "Імпарт вектарнай графікі"
 
-msgid "Scale:"
-msgstr "Маштаб:"
-
-msgid "unit(s) = "
-msgstr "адзінкі = "
-
-msgid "Importing..."
-msgstr "Імпартаванне..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVG файлы [модуль ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Адкрыйце ці стварыце пласт дадзеных перад імпартам"
-
 msgid "Concourse wizard ..."
 msgstr "Памагаты стварэння вестыбюляў..."
 
@@ -29749,7 +30237,7 @@ msgid "Check "
 msgstr "Праверыць "
 
 msgid "check the subset for junction properties"
-msgstr ""
+msgstr "праверыць падмноства на наяўнасць прыкмет злучэнняў"
 
 msgid "Search "
 msgstr "Знайсці "
@@ -29779,6 +30267,61 @@ msgstr "Лік знойдзеных {0}-шляхавых злучэнняў: {1}
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "стварыць усе камбінацыі з кандыдатаў уваходу/выхаду"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Замяніць геаметрыю"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Індэкс кірункаў ''{0}'' не знойдзены"
 
@@ -30037,407 +30580,6 @@ msgstr "Уключае модуль паведамленняў пра памыл
 msgid "Missing input data"
 msgstr "Уваходныя дадзеныя адсутнічаюць"
 
-msgid "Mapillary Images"
-msgstr "Здымкі Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Mapillary"
-
-msgid "Total images:"
-msgstr "Усяго здымкаў:"
-
-msgid "images"
-msgstr "здымкі"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr "Шрыфт дарожнага знака ў ''{0}'' мае няправільны фармат"
-
-msgid "Could not read font-file from ''{0}''"
-msgstr "Не атрымалася прачытаць файл шрыфта з ''{0}''"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Стварыць пласт Mapillary"
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr "Выберыце выявы"
-
-msgid "Import pictures into sequence"
-msgstr "Імпартаваць выявы ў паслядоўнасць"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Імпартаваць выявы ў паслядоўнасць у пласце Mapillary"
-
-msgid "Join mode"
-msgstr "Рэжым злучэння"
-
-msgid "Join/unjoin pictures"
-msgstr "Злучыць/раз''яднаць выявы"
-
-msgid "Join Mapillary pictures"
-msgstr "Злучыць выявы Mapillary"
-
-msgid "Submit changeset"
-msgstr "Перадаць пакет правак"
-
-msgid "Submit the current changeset"
-msgstr "Перадаць бягучы пакет правак"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Перадаць бягучы пакет правак у Mapillary"
-
-msgid "Upload pictures"
-msgstr "Адаслаць выявы"
-
-msgid "Upload Mapillary pictures"
-msgstr "Адаслаць выявы Mapillary"
-
-msgid "Upload pictures."
-msgstr "Адаслаць выявы."
-
-msgid "Walk mode"
-msgstr "Пешаходны рэжым"
-
-msgid "Start walk mode"
-msgstr "Пачаць пешаходны рэжым"
-
-msgid "Zoom to selected image"
-msgstr "Маштабаваць да вылучанага здымка"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Наблізіцца да бягучага вылучанага здымка Mapillary"
-
-msgid "Uploaded {0} images"
-msgstr "Адасланыя {0} выяў"
-
-msgid "Approve upload on the website"
-msgstr "Пацвярджаць адпраўку на вэб-сайт"
-
-msgid "View in website"
-msgstr "Паглядзець на вэб-сайце"
-
-msgid "Copy key"
-msgstr "Капіяваць ключ"
-
-msgid "Copy key tag"
-msgstr "Капіяваць тэг"
-
-msgid "Edit on website"
-msgstr "Рэдагаваць на сайце"
-
-msgid "Current Mapillary changeset"
-msgstr "Бягучы пакет правак Mapillary"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Адкрыць дыялог набору змен Mapillary"
-
-msgid "Mapillary changeset"
-msgstr "Пакет правак Mapillary"
-
-msgid "Submit"
-msgstr "Адправіць"
-
-msgid "Export all images"
-msgstr "Экспартаваць ўсе здымкі"
-
-msgid "Export selected sequence"
-msgstr "Экспартаваць выбраную паслядоўнасць"
-
-msgid "Export selected images"
-msgstr "Экспартаваць выдзеленыя здымкі"
-
-msgid "Rewrite imported images"
-msgstr "Перазапісаць імпартаваныя выявы"
-
-msgid "Select a folder"
-msgstr "Абярыце каталог"
-
-msgid "Explore"
-msgstr "Агляд"
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr "Здымак Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Адкрыць акно Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Дыялог Mapillary"
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr "Рэжым спампоўкі"
-
-msgid "You are logged in as ''{0}''."
-msgstr "Вы ўвайшлі як ''{0}''."
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr "усё ў бачнай вобласці"
-
-msgid "areas with downloaded OSM-data"
-msgstr "вобласці са спампаванымі дадзенымі OSM"
-
-msgid "only when manually requested"
-msgstr "толькі пры запыце ўручную"
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"Запампаваная вобласць OSM - занадта вялікая. Рэжым запампоўкі быў зменены на "
-"паўаўтаматычны да наступнага запуску пласта."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr "Няслушны ідэнтыфікатар малюнка ''{0}''!"
-
-msgid "The image key must not be null here!"
-msgstr "Ідэнтыфікатар малюнка тут не павінен мець значэнне null!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "Няслушны ідэнтыфікатар паслядоўнасці ''{0}''!"
-
-msgid "The sequence key must not be null here!"
-msgstr "Ідэнтыфікатар паслядоўнасці тут не павінен мець значэнне null!"
-
 msgid "Measured values"
 msgstr "Вымераныя значэнні"
 
@@ -31988,6 +32130,9 @@ msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 "ГТ: Маршрут праходзіць па дарозе з аднабаковым рухам у зваротным кірунку"
 
+msgid "moved"
+msgstr "перамешчаны"
+
 msgid "rail"
 msgstr "рэйка"
 
@@ -32085,9 +32230,6 @@ msgstr "Злавіць"
 msgid "Join"
 msgstr "Злучыць"
 
-msgid "moved"
-msgstr "перамешчаны"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Грамадскі транспарт: Злучэнне GTFS прыпынкаў"
 
@@ -32790,10 +32932,10 @@ msgid "Select a map object"
 msgstr "Вылучыце аб’ект карты"
 
 msgid "Shape actions panel"
-msgstr ""
+msgstr "Панэль дзеянняў з формамі"
 
 msgid "Shape mode control panel"
-msgstr ""
+msgstr "Панэль кіравання формамі"
 
 msgid "Rotate Mode:"
 msgstr "Рэжым кручэння:"
@@ -33138,6 +33280,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Шэраг хат уздоўж вуліцы"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr "To-fix"
 
@@ -33613,6 +33815,84 @@ msgstr "Абярыце дату заканчэння ключа:"
 msgid "Create a new signing key"
 msgstr "Стварыць новы ключ подпісу"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Наперад"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Назад"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Няма такой паласы."
 
@@ -34588,9 +34868,6 @@ msgstr "Знайсці прымітывы з гэтымі тэгамі"
 msgid "Multitag Background: highlight"
 msgstr "Змена тэгаў некалькіх аб''ектаў: фон вылучэння"
 
-msgid "Replace Geometry"
-msgstr "Замяніць геаметрыю"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Замяніць геаметрыю абранага аб’екта новай"
 
@@ -34806,15 +35083,9 @@ msgstr "пачынае/прыпыняе прайграванне відэа"
 msgid "Video: {0}"
 msgstr "Відэа: {0}"
 
-msgid "Backward"
-msgstr "Назад"
-
 msgid "jumps n sec back"
 msgstr "адкруціць n сек назад"
 
-msgid "Forward"
-msgstr "Наперад"
-
 msgid "jumps n sec forward"
 msgstr "праматаць n сек наперад"
 
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index 3b65d2e..f25e7c6 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2016-08-05 14:02+0000\n"
 "Last-Translator: pl <Unknown>\n"
 "Language-Team: Bulgarian <bg at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:43+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:38+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: bg\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -208,18 +208,6 @@ msgstr "Изберете на картата всички обекти, избр
 msgid "Add imagery layer {0}"
 msgstr "Добавете слой с изображения {0}"
 
-msgid "Error"
-msgstr "Грешка"
-
-msgid "Select image format for WMS layer"
-msgstr "Изберете формат на изображение за WMS слоя"
-
-msgid "Select WMS layers"
-msgstr "Изберете WMS слоеве"
-
-msgid "Add layers"
-msgstr "Добавете слоеве"
-
 msgid "Invalid service URL."
 msgstr "Невалиден адрес на услугата"
 
@@ -232,6 +220,18 @@ msgstr "Неуспешно получаването на списъка с WMS 
 msgid "Could not parse WMS layer list."
 msgstr "Неуспешно обработването на списъка с WMS слоеве"
 
+msgid "Error"
+msgstr "Грешка"
+
+msgid "Select image format for WMS layer"
+msgstr "Изберете формат на изображение за WMS слоя"
+
+msgid "Select WMS layers"
+msgstr "Изберете WMS слоеве"
+
+msgid "Add layers"
+msgstr "Добавете слоеве"
+
 msgid "Add Node..."
 msgstr "Добавяне на точка..."
 
@@ -3412,9 +3412,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3819,12 +3816,12 @@ msgstr ""
 msgid "House number without street"
 msgstr "Номер на къща без указана улица"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Дублиран номер на къща ''{0}''"
-
 msgid "Duplicate house numbers"
 msgstr "Дублирани номера на къщи"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Дублиран номер на къща ''{0}''"
+
 msgid "Multiple street names in relation"
 msgstr ""
 
@@ -3859,6 +3856,9 @@ msgstr "Брегови линии"
 msgid "This test checks that coastlines are correct."
 msgstr "Този тест проверява за правилността на бреговите линии."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Обърната брегова линия: земята не е отляво"
+
 msgid "Unconnected coastline"
 msgstr "Несвързана брегова линия"
 
@@ -3868,6 +3868,9 @@ msgstr "Неподредени брегови линии"
 msgid "Reversed coastline"
 msgstr "Обърната брегова линия"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3904,6 +3907,12 @@ msgstr "Пресичащи се граници"
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4124,6 +4133,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr "В мултиполигона има член, който не е път."
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4344,30 +4359,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Стойности съдържащи HTML елементи"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Ключ ''{0}'' не е намерен в шаблони."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr "Шаблоните не съдържат такъв ключ"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr ""
+msgid "Key ''{0}'' not in presets."
+msgstr "Ключ ''{0}'' не е намерен в шаблони."
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Стойността ''{0}'' за ключ ''{1}'' не е намерена в шаблоните."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr "Шаблоните не съдържат стойност"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Стойността ''{0}'' за ключ ''{1}'' не е намерена в шаблоните."
+
 msgid "FIXMES"
 msgstr "ЗА ПОПРАВКА"
 
@@ -4613,9 +4628,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Този тест проверява за посоката на вода, земя или брегови линии."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Обърната брегова линия: земята не е отляво"
-
 msgid "Reversed land: land not on left side"
 msgstr "Обърната посока на линията на сушата: земята не е от ляво"
 
@@ -5136,9 +5148,6 @@ msgstr "Географската дължина на показалеца на 
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "слоя не е в списъка."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6562,6 +6571,9 @@ msgstr ""
 msgid "Sort"
 msgstr "Сортиране"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Тип на обекта:"
 
@@ -6803,6 +6815,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -8079,9 +8099,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr "Площи около места"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Грешка! Възможно е да липсват маркери (тагове)."
-
 msgid "Search ..."
 msgstr "Търсене..."
 
@@ -8662,6 +8679,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Качване и запис на променените слоеве..."
 
@@ -8713,6 +8733,12 @@ msgstr "Излез сега!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Изтрий сега!"
 
@@ -8725,6 +8751,12 @@ msgstr "Изпълняване на действия преди затварян
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Изпълняване на действия преди изтриване"
 
@@ -10835,6 +10867,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr "Показвай поредния номер на сегментите"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Изобразвай границите на свалените данни."
 
@@ -12941,6 +12976,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "Грешка при NMEA импортиране!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Грешка! Възможно е да липсват маркери (тагове)."
+
 msgid "Note Files"
 msgstr ""
 
@@ -13306,6 +13344,9 @@ msgstr "Качване на данни..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14965,6 +15006,9 @@ msgstr "Tiris: DGM (Terrain model)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Surface model)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -15076,7 +15120,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15257,6 +15304,9 @@ msgstr "Drone Imagery 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15551,18 +15601,6 @@ msgstr "Freemap.sk Cyclo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Ski"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakia Historic Maps"
 
@@ -15572,6 +15610,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
@@ -15704,6 +15745,9 @@ msgstr "U.S. Forest Service roads"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -16073,6 +16117,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16190,6 +16237,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Помага за векторизиране на WMS изображения."
 
@@ -16397,6 +16447,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Създава терасовидни къщи от един блок."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16419,6 +16474,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16575,6 +16633,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17895,6 +17957,9 @@ msgstr "Строеж"
 msgid "Ford"
 msgstr "Брод"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Други"
 
@@ -19514,6 +19579,9 @@ msgstr "Писта за излитане"
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Хеликоптерна площадка"
 
@@ -20184,11 +20252,11 @@ msgstr "Номер на пункта"
 msgid "Point Name"
 msgstr "Име на пункта"
 
-msgid "Phone Number"
-msgstr "Телефонен номер"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Използвайте международен код, като например +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -20202,6 +20270,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr "Автоматичен дефибрилатор (AED)"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Телефонен номер"
+
 msgid "Located inside a building?"
 msgstr "В сграда?"
 
@@ -21071,6 +21145,10 @@ msgid "university"
 msgstr "университет"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "болница"
 
@@ -21155,6 +21233,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23360,7 +23442,13 @@ msgstr "Природен резерват"
 msgid "Scree"
 msgstr "Сипей"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -24029,16 +24117,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
+msgid "national"
 msgstr ""
 
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -24047,18 +24129,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24071,18 +24141,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24275,9 +24333,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr "{0} без {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} без {1} или {2}"
 
@@ -24287,6 +24356,12 @@ msgstr "{0} без {1}, {2} или {3}"
 msgid "{0} together with {1}"
 msgstr "{0} заедно с {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24302,39 +24377,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr "заведение без име"
-
-msgid "{0} used with {1}"
-msgstr "{0} се използва с {1}"
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24353,9 +24413,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} е остаряло"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr "''{0}'' е безсмислено, използвайте по-точни етикети, напр. ''{1}''"
 
@@ -24410,10 +24479,16 @@ msgstr "Неопределен етикет {0}"
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24429,7 +24504,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24474,7 +24549,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24508,6 +24583,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr "съкратено име на улица"
 
@@ -24526,6 +24604,9 @@ msgstr "магистрала без означение"
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr "{0} се използва с {1}"
+
 msgid "street name contains ss"
 msgstr "името на улица съдържа \"ss\""
 
@@ -24616,11 +24697,14 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr "{0} е ненужно"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} е ненужно за {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} е безсмислено"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr ""
@@ -24867,6 +24951,27 @@ msgstr "Качване на GPX следа"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Качване на следи на openstreetmap.org"
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Мащаб:"
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr "м"
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25205,3307 +25310,3344 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
-msgstr "Нечетни"
-
-msgid "Even"
-msgstr "Четни"
-
-msgid "Alphabetic"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Numeric"
+msgid "Explore"
 msgstr ""
 
-msgid "Actual"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Estimate"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Potential"
+msgid "Give way"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "No entry"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Increment:"
-msgstr "Нарастване:"
-
-msgid "Starting #:"
-msgstr "Начален номер:"
-
-msgid "Ending #:"
-msgstr "Краен номер:"
-
-msgid "Accuracy:"
-msgstr "Точност:"
-
-msgid "Convert way to individual house numbers."
+msgid "Uneven road"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "No parking"
 msgstr ""
 
-msgid "City:"
-msgstr "Град:"
-
-msgid "State:"
-msgstr "Област/Щат:"
-
-msgid "Post Code:"
-msgstr "Пощенски код:"
-
-msgid "Country:"
-msgstr "Държава:"
-
-msgid "Full Address:"
-msgstr "Пълен адрес:"
-
-msgid "Optional Information:"
-msgstr "Допълнителна информация:"
+msgid "No overtaking"
+msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "No turn"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Years"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Months"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Days"
 msgstr ""
 
-msgid "Country code must be 2 letters"
-msgstr "Кодът на държавата трябва да бъде от два символа"
+msgid "Imported images"
+msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Align Ways"
-msgstr "Подравни пътищата"
+msgid "Mapillary picture"
+msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Next picture"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Previous picture"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Jump to red"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Stops the walk."
 msgstr ""
 
-msgid "Length preserved"
+msgid "Play"
 msgstr ""
 
-msgid "Angle preserved"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid "Align with:"
-msgstr "Подравни с:"
+msgid "Pause"
+msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "I''m ready!"
-msgstr "Готово!"
+msgid "Use 24 hour format"
+msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Ways mode"
+msgid "Login"
 msgstr ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Параметърът ''{0}'' не трябва да е празен"
+msgid "Logout"
+msgstr "Отписване"
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "Download mode"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Follow selected image"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Go forward"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+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 ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+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 ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "everything in the visible area"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Downloading"
 msgstr ""
 
-msgid "What''s new..."
-msgstr "Какво ново..."
-
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "Select mode"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Errr..."
-msgstr "Хм..."
-
-msgid "Browser not supported."
-msgstr "Този браузър не се поддържа."
-
-msgid "Building address"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid "empty"
-msgstr "празно"
-
-msgid "skip"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid "House number:"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid "Street:"
-msgstr "Улица:"
-
-msgid "Post code:"
-msgstr "Пощенски код:"
-
-msgid "Building:"
-msgstr "Сграда:"
-
-msgid "Tags:"
-msgstr "Тагове:"
+msgid "Total Mapillary images: {0}"
+msgstr ""
 
-msgid "Name:"
-msgstr "Име:"
+msgid "Submitting Mapillary Changeset"
+msgstr ""
 
-msgid "updated building info"
+msgid "No images found"
 msgstr ""
 
-msgid "Tag Element"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Tag Building"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Tools: {0}"
-msgstr "Инструменти: {0}"
+msgid "Not Logged in to Mapillary"
+msgstr ""
 
-msgid "Area Selection"
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Area Selector"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Created area"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Error Report"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Training process configuration"
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Model Settings"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "merge nodes"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Debug"
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Choose key"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Street Name:"
-msgstr "Име на улица:"
+msgid "Error in timeformat"
+msgstr ""
 
-msgid "Big buildings mode"
+msgid "open end"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid "Advanced settings"
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "Create building"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Length step:"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Advanced..."
-msgstr "Разширени..."
-
-msgid "Draw buildings"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Odd"
+msgstr "Нечетни"
+
+msgid "Even"
+msgstr "Четни"
+
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Numeric"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Actual"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Estimate"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Potential"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Numbering Scheme:"
 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] ""
+msgid "Increment:"
+msgstr "Нарастване:"
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Starting #:"
+msgstr "Начален номер:"
 
-msgid "No address nodes inside buildings found"
+msgid "Ending #:"
+msgstr "Краен номер:"
+
+msgid "Accuracy:"
+msgstr "Точност:"
+
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "on polygon"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Add address"
-msgstr "Добавяне на адрес"
+msgid "City:"
+msgstr "Град:"
 
-msgid "Helping tool for tag address"
+msgid "State:"
+msgstr "Област/Щат:"
+
+msgid "Post Code:"
+msgstr "Пощенски код:"
+
+msgid "Country:"
+msgstr "Държава:"
+
+msgid "Full Address:"
+msgstr "Пълен адрес:"
+
+msgid "Optional Information:"
+msgstr "Допълнителна информация:"
+
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Next no"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Country code must be 2 letters"
+msgstr "Кодът на държавата трябва да бъде от два символа"
+
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
-msgstr "CadastreGrabber: Невалидно url."
+msgid "Align Ways"
+msgstr "Подравни пътищата"
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Choose from..."
-msgstr "Избери от..."
-
-msgid "Select commune"
-msgstr "Избор на комуна"
-
-msgid "Auto sourcing"
-msgstr "Авто-определяне източници"
-
 msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
-msgstr "Замени оригиналния фон с фонов цвят от JOSM."
-
-msgid "Reverse grey colors (for black backgrounds)."
-msgstr "Обърни сивите цветове (за черни фонове)."
-
-msgid "Set background transparent."
-msgstr "Заване на прозрачен фон."
-
-msgid "Draw boundaries of downloaded data."
-msgstr "Обозначване на границите на зона със свалени данни."
-
-msgid "Disable image cropping during georeferencing."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid "Align way segment"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "off"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid "25 m"
+msgid "Length preserved"
 msgstr ""
 
-msgid "50 m"
+msgid "Angle preserved"
 msgstr ""
 
-msgid "100 m"
-msgstr ""
+msgid "Align with:"
+msgstr "Подравни с:"
 
-msgid "high"
+msgid ""
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "low"
-msgstr "нисък"
+msgid "I''m ready!"
+msgstr "Готово!"
 
-msgid "symbol"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "parcel"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "parcel number"
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "address"
-msgstr "адрес"
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Параметърът ''{0}'' не трябва да е празен"
 
-msgid "locality"
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "section"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "commune"
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Enable automatic caching."
-msgstr "Включване автоматично кеширане."
-
-msgid "Max. cache size (in MB)"
-msgstr "Макс. размер на кеша (в MB)"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgstr ""
 
-msgid "French cadastre WMS"
-msgstr "Френски кадастров WMS"
+msgid ": Align segments; Alt-click: Clear selection"
+msgstr ""
 
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
-"Специален доставчик на френски кадастров wms на "
-"www.cadastre.gouv.fr<BR><BR>Моля прочетете правилата и условията за ползване "
-"оттук (на френски): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR> преди да качвате каквито и да са данни създадени с това разширение."
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
-"<html>Стойността на ключа \"source\" когато автоматичното определяне на "
-"източници е включено</html>"
 
 msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
 msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
-"Размени оригиналните цветове черно-бяло (и всички междинни сиви). Полезно за "
-"текстове на тъмни фонове."
 
-msgid "Allows multiple layers stacking"
-msgstr "Позволяване на подреждане в няколко слоя"
-
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
-"Задаване прозрачност на WMS слоевете. Надясно - плътно, наляво - прозрачно."
 
-msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr "Рисувай правоъгълник около зареденните от WMS сървър данни."
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
 
-msgid "Image resolution:"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "What''s new..."
+msgstr "Какво ново..."
+
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Errr..."
+msgstr "Хм..."
+
+msgid "Browser not supported."
+msgstr "Този браузър не се поддържа."
+
+msgid "Building address"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "empty"
+msgstr "празно"
+
+msgid "skip"
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "House number:"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
-msgstr "Взимане по-малки изображения (по-високо качество, но повече памет)"
+msgid "Street:"
+msgstr "Улица:"
 
-msgid "Fixed size square (default is 100m)"
-msgstr "Фиксирана площ (по подразбиране 100m2)"
+msgid "Post code:"
+msgstr "Пощенски код:"
 
-msgid "Fixed size (from 25 to 1000 meters)"
-msgstr "Фиксирана размер (от 25 до 1000 метра)"
+msgid "Building:"
+msgstr "Сграда:"
 
-msgid "Layers:"
+msgid "Tags:"
+msgstr "Тагове:"
+
+msgid "Name:"
+msgstr "Име:"
+
+msgid "updated building info"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Tag Element"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Parcels."
+msgid "Tools: {0}"
+msgstr "Инструменти: {0}"
+
+msgid "Area Selection"
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Area Selector"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid "Created area"
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Error Report"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Something went wrong!"
+msgstr ""
+
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Custom - low resolution images"
 msgstr ""
-"Най-старите файлове автоматично се изтриват когато този размер се премине"
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
-msgstr "Добавяне на \"source=...\" към ?"
-
-msgid "Downloading {0}"
-msgstr "Сваляне {0}"
-
-msgid "Contacting WMS Server..."
-msgstr "Свързване с WMS Сървър..."
-
-msgid "Create buildings"
-msgstr "Създаване на сгради"
+msgid "Distance Tolerance"
+msgstr ""
 
 msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
-"За да избегенете претоварване на cadastre WMS,\n"
-"размера на импорта на сгради е ограничен до 1 km2 макс."
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr "Моля, включете авто-източниците и проверете cadastre millesime."
-
-msgid "Extract SVG ViewBox..."
-msgstr "Екстракт SVG ViewBox..."
-
-msgid "Extract best fitting boundary..."
-msgstr "Екстракт най-добре съвпадаща граница..."
-
-msgid "Create boundary"
-msgstr "Създаване на граница"
+msgid "Angle Tolerance"
+msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Image already loaded"
-msgstr "Изображението вече е заредено"
+msgid "Color Threshold"
+msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Extract commune boundary"
-msgstr "Екстракт граница на комуна"
-
-msgid "Only on vectorized layers"
-msgstr "Само на векторни слоеве"
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
 
-msgid "Cancel current grab"
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "show address dialog"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
-msgstr "Зареждане на изображение от френски кадастърен WMS"
+msgid "merge nodes"
+msgstr ""
 
-msgid "Cadastre: {0}"
-msgstr "Кадастър: {0}"
+msgid "Merge nodes with existing nodes"
+msgstr ""
 
-msgid "Georeference an image"
+msgid "Debug"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Building Generalization"
 msgstr ""
 
 msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr "Зареждане на местоположението от кеша (само ако той е включен)"
-
-msgid "{0} not allowed with the current projection"
+msgid "Alert Message"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
-msgstr ""
+msgid "Street Name:"
+msgstr "Име на улица:"
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid "(optional)"
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Change location"
-msgstr "Промяна местоположение"
-
-msgid "Set a new location for the next request"
-msgstr "Посочете ново местоположения за следващата заявка"
-
-msgid "Add a new municipality layer"
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Commune"
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+msgid "Create building"
 msgstr ""
-"<html>Въведете име на град или село.<br>Използвайте синтаксиса и "
-"пунктуацията известни от  www.cadastre.gouv.fr .</html>"
 
-msgid "Departement"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Add new layer"
-msgstr "Добавяне на нов слой"
-
-msgid "Open Cadastre Preferences"
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Reset cookie"
-msgstr "Нулиране на cookie"
+msgid "Length step:"
+msgstr ""
 
-msgid "Get a new cookie (session timeout)"
-msgstr "Взимане ново cookie (изтичане на сесията)"
+msgid "Advanced..."
+msgstr "Разширени..."
 
-msgid "Save image as..."
+msgid "Draw buildings"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Set width of the building"
 msgstr ""
 
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Image cropping"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
-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] ""
 
-msgid "Enter cadastre east,north position"
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "on polygon"
 msgstr ""
 
-msgid "East"
-msgstr "Изток"
+msgid "Add address"
+msgstr "Добавяне на адрес"
 
-msgid "I use the mouse"
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Next no"
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Adjust WMS"
-msgstr "Настройка на WMS"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
+msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
-"Има повече от един WMS слой. Изберете\n"
-"един от тях първо, после опитайте отново."
 
-msgid "Reset offset"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Blank Layer"
-msgstr "Празен слой"
-
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr "WMS слой ({0}), {1} квадрант(и) зареден(и)"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgstr ""
 
-msgid "Is not vectorized."
-msgstr "Не е векоторизиран."
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Is vectorized."
-msgstr "Векторизиран."
+msgid "CadastreGrabber: Illegal url."
+msgstr "CadastreGrabber: Невалидно url."
 
-msgid "Commune bbox: {0}"
-msgstr "Комуна bbox: {0}"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
 
 msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
-"Не поддържана версия на кеш файлове; намерена {0}, очаквана {1}\n"
-"Моля, създайте нов кеш."
 
-msgid "Cache Format Error"
-msgstr "Грешка на кеш формата"
+msgid "Choose from..."
+msgstr "Избери от..."
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
+msgid "Select commune"
+msgstr "Избор на комуна"
 
-msgid "Cache Lambert Zone Error"
-msgstr "Грешка в кеширането на Ламбертовата зона"
+msgid "Auto sourcing"
+msgstr "Авто-определяне източници"
 
-msgid "canvec tile helper"
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Use"
-msgstr "Използване"
-
-msgid "Please select a scheme to use."
-msgstr "Моля, изберете схема за използване."
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgstr ""
 
-msgid "Color Scheme"
-msgstr "Цветова схема"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
+msgstr ""
 
-msgid "Please select the scheme to delete."
-msgstr "Моля, изберете схема за изтриване."
+msgid "Change the current projection"
+msgstr ""
 
-msgid "Use the selected scheme from the list."
-msgstr "Изполвайте избраната от списъка схема."
+msgid "Replace original background by JOSM background color."
+msgstr "Замени оригиналния фон с фонов цвят от JOSM."
 
-msgid "Use the current colors as a new color scheme."
-msgstr "Използвайте текущите цветове като нова цветова схема."
+msgid "Reverse grey colors (for black backgrounds)."
+msgstr "Обърни сивите цветове (за черни фонове)."
 
-msgid "Delete the selected scheme from the list."
-msgstr "Изтриване на избраната схема от списъка."
+msgid "Set background transparent."
+msgstr "Заване на прозрачен фон."
 
-msgid "Color Schemes"
-msgstr "Цветни схеми"
+msgid "Draw boundaries of downloaded data."
+msgstr "Обозначване на границите на зона със свалени данни."
 
-msgid "Conflate object pair"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflation"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Matches"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Reference only"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Subject only"
+msgid "off"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "25 m"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "50 m"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "100 m"
 msgstr ""
 
-msgid "Configure"
-msgstr "Настройки"
-
-msgid "Configure conflation options"
+msgid "high"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "medium"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
-msgstr ""
+msgid "low"
+msgstr "нисък"
 
-msgid "Remove selected matches"
+msgid "symbol"
 msgstr ""
 
-msgid "Conflate"
+msgid "parcel"
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "parcel number"
 msgstr ""
 
-msgid "Conflation: {0}"
-msgstr ""
+msgid "address"
+msgstr "адрес"
 
-msgid "Cannot replace geometry."
+msgid "locality"
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "section"
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "commune"
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
-msgstr ""
+msgid "Enable automatic caching."
+msgstr "Включване автоматично кеширане."
 
-msgid "Match finder settings"
+msgid "Max. cache size (in MB)"
+msgstr "Макс. размер на кеша (в MB)"
+
+msgid "French cadastre WMS"
+msgstr "Френски кадастров WMS"
+
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
+"Специален доставчик на френски кадастров wms на "
+"www.cadastre.gouv.fr<BR><BR>Моля прочетете правилата и условията за ползване "
+"оттук (на френски): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR> преди да качвате каквито и да са данни създадени с това разширение."
 
-msgid "Match finder method"
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
+"<html>Стойността на ключа \"source\" когато автоматичното определяне на "
+"източници е включено</html>"
 
-msgid "Threshold distance"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
+"Размени оригиналните цветове черно-бяло (и всички междинни сиви). Полезно за "
+"текстове на тъмни фонове."
 
-msgid "Centroid distance"
+msgid "Allows multiple layers stacking"
+msgstr "Позволяване на подреждане в няколко слоя"
+
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
+"Задаване прозрачност на WMS слоевете. Надясно - плътно, наляво - прозрачно."
 
-msgid "Hausdorff distance"
+msgid "Draw a rectangle around downloaded data from WMS server."
+msgstr "Рисувай правоъгълник около зареденните от WMS сървър данни."
+
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Generate matches"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Layer:"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Subject"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Grab smaller images (higher quality but use more memory)"
+msgstr "Взимане по-малки изображения (по-високо качество, но повече памет)"
+
+msgid "Fixed size square (default is 100m)"
+msgstr "Фиксирана площ (по подразбиране 100m2)"
+
+msgid "Fixed size (from 25 to 1000 meters)"
+msgstr "Фиксирана размер (от 25 до 1000 метра)"
+
+msgid "Layers:"
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Empty selection"
+msgid "Parcels."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Download Settings"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
+"Най-старите файлове автоматично се изтриват когато този размер се премине"
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Requires restart"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Max threads"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Add \"source=...\" to elements?"
+msgstr "Добавяне на \"source=...\" към ?"
+
+msgid "Downloading {0}"
+msgstr "Сваляне {0}"
+
+msgid "Contacting WMS Server..."
+msgstr "Свързване с WMS Сървър..."
+
+msgid "Create buildings"
+msgstr "Създаване на сгради"
+
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
+"За да избегенете претоварване на cadastre WMS,\n"
+"размера на импорта на сгради е ограничен до 1 km2 макс."
 
-msgid "Max download boxes"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgstr "Моля, включете авто-източниците и проверете cadastre millesime."
+
+msgid "Extract SVG ViewBox..."
+msgstr "Екстракт SVG ViewBox..."
+
+msgid "Extract best fitting boundary..."
+msgstr "Екстракт най-добре съвпадаща граница..."
+
+msgid "Create boundary"
+msgstr "Създаване на граница"
+
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
+msgid "Image already loaded"
+msgstr "Изображението вече е заредено"
+
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "Extract commune boundary"
+msgstr "Екстракт граница на комуна"
+
+msgid "Only on vectorized layers"
+msgstr "Само на векторни слоеве"
+
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Extra download area"
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Max download area"
+msgid "Download Image from French Cadastre WMS"
+msgstr "Зареждане на изображение от френски кадастърен WMS"
+
+msgid "Cadastre: {0}"
+msgstr "Кадастър: {0}"
+
+msgid "Georeference an image"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Split area"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "Load location from cache (only if cache is enabled)"
+msgstr "Зареждане на местоположението от кеша (само ако той е включен)"
+
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
-"Избраната област не може да бъде разделена, защото е член на връзка.\n"
-"Премахнете областта от връзката преди да я разделите."
-
-msgid "TangoGPS Files (*.log)"
-msgstr "файлове на TangoGPS (*.log)"
 
-msgid "Coordinates imported: "
-msgstr "Координати импортирани: "
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgstr ""
 
-msgid "Format errors: "
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "TangoGPS import success"
-msgstr "успешно внасяне от TangoGPS"
+msgid "(optional)"
+msgstr ""
 
-msgid "TangoGPS import failure!"
-msgstr "неуспешно внасяне от TangoGPS!"
+msgid "Change location"
+msgstr "Промяна местоположение"
 
-msgid "TCX Files (*.tcx)"
-msgstr "файлове TCX (*.tcx)"
+msgid "Set a new location for the next request"
+msgstr "Посочете ново местоположения за следващата заявка"
 
-msgid "Download along..."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "Commune"
 msgstr ""
 
-msgid "Download Along"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
+"<html>Въведете име на град или село.<br>Използвайте синтаксиса и "
+"пунктуацията известни от  www.cadastre.gouv.fr .</html>"
 
-msgid "Please select 1 or more ways to download along"
+msgid "Departement"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid "Add new layer"
+msgstr "Добавяне на нов слой"
+
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "EditGpx"
-msgstr "Редактиране GPX"
-
-msgid "Layer for editing GPX tracks"
-msgstr "Слой за редактиране на GPX следи"
+msgid "Reset cookie"
+msgstr "Нулиране на cookie"
 
-msgid "Convert to GPX layer with anonymised time"
-msgstr "Преобразуване към GPX слой с анонимно време"
+msgid "Get a new cookie (session timeout)"
+msgstr "Взимане ново cookie (изтичане на сесията)"
 
-msgid "edit gpx tracks"
-msgstr "редактиране gpx следи"
+msgid "Save image as..."
+msgstr ""
 
-msgid "Import path from GPX layer"
-msgstr "Импортиране на път от GPX слой"
+msgid "PNG files (*.png)"
+msgstr ""
 
-msgid "Drop existing path"
-msgstr "Височина на съществуващ път"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
 
-msgid "No GPX data layer found."
-msgstr "Не е открит слой с GPX данни."
+msgid "Export image (only raster images)"
+msgstr ""
 
-msgid "External tool error"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Image cropping"
 msgstr ""
 
 msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "Edit tool"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "External tools"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "East"
+msgstr "Изток"
+
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Are you sure?"
-msgstr "Сигурни ли сте?"
+msgid "Set {0} Lambert coordinates"
+msgstr ""
 
-msgid "New tool..."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "Install"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Public"
+msgid "Adjust WMS"
+msgstr "Настройка на WMS"
+
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
+"Има повече от един WMS слой. Изберете\n"
+"един от тях първо, после опитайте отново."
 
-msgid "Failed to login as {0}:"
+msgid "Reset offset"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Blank Layer"
+msgstr "Празен слой"
+
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr "WMS слой ({0}), {1} квадрант(и) зареден(и)"
+
+msgid "Is not vectorized."
+msgstr "Не е векоторизиран."
+
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "GeoChat"
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Is vectorized."
+msgstr "Векторизиран."
+
+msgid "Commune bbox: {0}"
+msgstr "Комуна bbox: {0}"
+
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
+"Не поддържана версия на кеш файлове; намерена {0}, очаквана {1}\n"
+"Моля, създайте нов кеш."
 
-msgid "Zoom in to see messages"
+msgid "Cache Format Error"
+msgstr "Грешка на кеш формата"
+
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Login"
+msgid "Cache Lambert Zone Error"
+msgstr "Грешка в кеширането на Ламбертовата зона"
+
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Use"
+msgstr "Използване"
+
+msgid "Please select a scheme to use."
+msgstr "Моля, изберете схема за използване."
+
+msgid "Color Scheme"
+msgstr "Цветова схема"
+
+msgid "Please select the scheme to delete."
+msgstr "Моля, изберете схема за изтриване."
+
+msgid "Use the selected scheme from the list."
+msgstr "Изполвайте избраната от списъка схема."
+
+msgid "Use the current colors as a new color scheme."
+msgstr "Използвайте текущите цветове като нова цветова схема."
+
+msgid "Delete the selected scheme from the list."
+msgstr "Изтриване на избраната схема от списъка."
+
+msgid "Color Schemes"
+msgstr "Цветни схеми"
+
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "not logged in"
+msgid "Conflation"
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Matches"
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Reference only"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Subject only"
 msgstr ""
 
-msgid "Users mapping nearby:"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Private chat"
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Close tab"
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Logout"
-msgstr "Отписване"
+msgid "Configure"
+msgstr "Настройки"
 
-msgid "Clear log"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Conflate"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "Position only"
-msgstr "Само позиция"
+msgid "Conflation: {0}"
+msgstr ""
 
-msgid "Position, Time, Date, Speed"
-msgstr "Положение, време, дата, скорост"
+msgid "Cannot replace geometry."
+msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
-msgstr "Положение, време, дата, скорост, височина"
+msgid "Zoom to selected primitive(s)"
+msgstr ""
 
-msgid "A By Time"
-msgstr "A по време"
+msgid "Select selected primitive(s)"
+msgstr ""
 
-msgid "A By Distance"
-msgstr "A по разстояние"
+msgid "Select the primitives currently selected in the list"
+msgstr ""
 
-msgid "B By Time"
-msgstr "B по време"
+msgid "Match finder settings"
+msgstr ""
 
-msgid "B By Distance"
-msgstr "B по разстояние"
+msgid "Match finder method"
+msgstr ""
 
-msgid "C By Time"
-msgstr "C по време"
+msgid "Threshold distance"
+msgstr ""
 
-msgid "C By Distance"
-msgstr "C по разстояние"
+msgid "Distances greater than this will result in a score of zero."
+msgstr ""
 
-msgid "Data Logging Format"
-msgstr "Формат за натрупване на данни"
+msgid "Centroid distance"
+msgstr ""
 
-msgid "Disable data logging if speed falls below"
-msgstr "Изключване на натрупването на данни ако скоростта падне под"
+msgid "Hausdorff distance"
+msgstr ""
 
-msgid "Disable data logging if distance falls below"
-msgstr "Изключване на натрупването на данни ако разстоянието падне под"
+msgid "Configure conflation settings"
+msgstr ""
 
-msgid "Unknown logFormat"
-msgstr "Неизвестен формат за натрупване"
+msgid "Generate matches"
+msgstr ""
 
-msgid "Port:"
-msgstr "Порт:"
+msgid "Layer:"
+msgstr ""
 
-msgid "refresh the port list"
-msgstr "обнови списъка с портове"
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgstr ""
 
-msgid "Configure Device"
-msgstr "Конфигуриране на устройство"
+msgid "Subject"
+msgstr ""
 
-msgid "Connection Error."
-msgstr "Грешка при свързване."
+msgid "Selections must be made for both reference and subject."
+msgstr ""
 
-msgid "configure the connected DG100"
-msgstr "конфигуриране на свързаното DG100"
+msgid "Incomplete selections"
+msgstr ""
 
-msgid "delete data after import"
-msgstr "изтриване на данните след импорт"
+msgid "Restore subject selection"
+msgstr ""
 
-msgid "Importing data from device."
-msgstr "Импортиране на данни от устройство."
-
-msgid "Importing data from DG100..."
-msgstr "Импортиране данни от DG100..."
-
-msgid "Error deleting data."
-msgstr "Грешка при изтриване на данни."
-
-msgid "imported data from {0}"
-msgstr "Импортирани данни от {0}"
-
-msgid "No data found on device."
-msgstr "На устройството не са открити данни."
-
-msgid "Connection failed."
-msgstr "Връзката се разпадна."
-
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
-"Не може да бъде заредана библиотеката rxtxSerial. Ако се нуждаете от помощ "
-"за инсталирането й обърнете се към Globalsat на адрес http://www.raphael-"
-"mack.de/josm-globalsat-gpx-import-plugin/"
-
-msgid "Globalsat Import"
-msgstr "Globalsat Импорт"
-
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr "Импорт данни от Globalsat Datalogger DG100 в GPX слой."
-
-msgid "Import"
-msgstr "Импорт"
 
-msgid "GPS Blams"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "GPSBlam"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPX Data"
+msgid "Empty selection"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "Class element without name"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Max threads"
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Download strategy"
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "Split area"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
+"Избраната област не може да бъде разделена, защото е член на връзка.\n"
+"Премахнете областта от връзката преди да я разделите."
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS Files (*.log)"
+msgstr "файлове на TangoGPS (*.log)"
+
+msgid "Coordinates imported: "
+msgstr "Координати импортирани: "
+
+msgid "Format errors: "
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import success"
+msgstr "успешно внасяне от TangoGPS"
+
+msgid "TangoGPS import failure!"
+msgstr "неуспешно внасяне от TangoGPS!"
+
+msgid "TCX Files (*.tcx)"
+msgstr "файлове TCX (*.tcx)"
+
+msgid "Download along..."
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "File not found:\n"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "height (m)"
-msgstr "височина (м)"
+msgid "EditGpx"
+msgstr "Редактиране GPX"
 
-msgid "width (m)"
-msgstr "ширина (м)"
+msgid "Layer for editing GPX tracks"
+msgstr "Слой за редактиране на GPX следи"
 
-msgid "length (m)"
-msgstr "дължина (м)"
+msgid "Convert to GPX layer with anonymised time"
+msgstr "Преобразуване към GPX слой с анонимно време"
 
-msgid "speed (km/h)"
-msgstr "скорост (км/ч)"
+msgid "edit gpx tracks"
+msgstr "редактиране gpx следи"
 
-msgid "weight (t)"
-msgstr "тегло (т)"
+msgid "Import path from GPX layer"
+msgstr "Импортиране на път от GPX слой"
 
-msgid "axleload (t)"
-msgstr "маса на ос (т)"
+msgid "Drop existing path"
+msgstr "Височина на съществуващ път"
 
-msgid "Bookmark name"
-msgstr ""
+msgid "No GPX data layer found."
+msgstr "Не е открит слой с GPX данни."
 
-msgid "Bookmark name already exists!"
+msgid "External tool error"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access class"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Access types"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Road requirements"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
-msgstr ""
+msgid "Are you sure?"
+msgstr "Сигурни ли сте?"
 
-msgid "Maximum incline the vehicle can go down"
+msgid "New tool..."
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Install"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "Public"
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "GeoChat"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "default"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "end nodes"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "incline"
-msgstr "наклон"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Ruleset:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Parameters:"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Coloring:"
-msgstr "Оцветяване:"
+msgid "Failed to send message:"
+msgstr ""
 
-msgid "Create/update graph"
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Graphview"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "Ruleset"
+msgid "Private chat"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Close tab"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Clear log"
 msgstr ""
 
-msgid "Select directory"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Vehicle"
-msgstr "Превозно средство"
-
-msgid "Restore defaults"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Visualization"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Node color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrow color"
-msgstr ""
+msgid "Position only"
+msgstr "Само позиция"
 
-msgid "Arrowhead fill color"
-msgstr ""
+msgid "Position, Time, Date, Speed"
+msgstr "Положение, време, дата, скорост"
 
-msgid "Arrowhead placement"
-msgstr ""
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr "Положение, време, дата, скорост, височина"
 
-msgid "New bookmark"
-msgstr ""
+msgid "A By Time"
+msgstr "A по време"
 
-msgid "Really delete \"{0}\"?"
-msgstr ""
+msgid "A By Distance"
+msgstr "A по разстояние"
 
-msgid "Bookmark deletion"
-msgstr ""
+msgid "B By Time"
+msgstr "B по време"
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
-msgstr ""
+msgid "B By Distance"
+msgstr "B по разстояние"
 
-msgid "Bookmark reset"
-msgstr ""
+msgid "C By Time"
+msgstr "C по време"
 
-msgid "Choose node color"
-msgstr ""
+msgid "C By Distance"
+msgstr "C по разстояние"
 
-msgid "Choose arrow color"
-msgstr ""
+msgid "Data Logging Format"
+msgstr "Формат за натрупване на данни"
 
-msgid "Choose arrowhead fill color"
-msgstr ""
+msgid "Disable data logging if speed falls below"
+msgstr "Изключване на натрупването на данни ако скоростта падне под"
 
-msgid "Routing graph calculated by the GraphView plugin"
-msgstr ""
+msgid "Disable data logging if distance falls below"
+msgstr "Изключване на натрупването на данни ако разстоянието падне под"
 
-msgid "GraphView layer is not mergable"
-msgstr ""
+msgid "Unknown logFormat"
+msgstr "Неизвестен формат за натрупване"
 
-msgid "graphview default node"
-msgstr ""
+msgid "Port:"
+msgstr "Порт:"
 
-msgid "graphview default segment"
-msgstr ""
+msgid "refresh the port list"
+msgstr "обнови списъка с портове"
 
-msgid "graphview arrowhead core"
-msgstr ""
+msgid "Configure Device"
+msgstr "Конфигуриране на устройство"
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
-msgstr ""
+msgid "Connection Error."
+msgstr "Грешка при свързване."
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
-msgstr ""
+msgid "configure the connected DG100"
+msgstr "конфигуриране на свързаното DG100"
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
-msgstr ""
+msgid "delete data after import"
+msgstr "изтриване на данните след импорт"
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
-msgstr ""
+msgid "Importing data from device."
+msgstr "Импортиране на данни от устройство."
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
-msgstr ""
+msgid "Importing data from DG100..."
+msgstr "Импортиране данни от DG100..."
+
+msgid "Error deleting data."
+msgstr "Грешка при изтриване на данни."
+
+msgid "imported data from {0}"
+msgstr "Импортирани данни от {0}"
+
+msgid "No data found on device."
+msgstr "На устройството не са открити данни."
+
+msgid "Connection failed."
+msgstr "Връзката се разпадна."
 
 msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
+"Не може да бъде заредана библиотеката rxtxSerial. Ако се нуждаете от помощ "
+"за инсталирането й обърнете се към Globalsat на адрес http://www.raphael-"
+"mack.de/josm-globalsat-gpx-import-plugin/"
 
-msgid "Imagery XML Files"
-msgstr ""
+msgid "Globalsat Import"
+msgstr "Globalsat Импорт"
 
-msgid "Save Imagery XML file"
-msgstr ""
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgstr "Импорт данни от Globalsat Datalogger DG100 в GPX слой."
 
-msgid "XML Imagery Bounds"
-msgstr ""
+msgid "Import"
+msgstr "Импорт"
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "Class element without name"
 msgstr ""
 
-msgid "Change Color"
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "Offset"
-msgstr "Отместване"
-
-msgid "Imagery Offset Database"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "mm"
-msgstr "мм"
-
-msgid "cm"
-msgstr "см"
-
-msgid "m"
-msgstr "м"
-
-msgid "km"
-msgstr "км"
+msgid "Key element without attribute k"
+msgstr ""
 
-msgid "Calibration geometries"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined right here"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Server has rejected the request"
-msgstr "Сървърът отхвърли заявката"
-
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
-msgstr ""
+msgid "height (m)"
+msgstr "височина (м)"
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
-msgstr ""
+msgid "width (m)"
+msgstr "ширина (м)"
 
-msgid "Store calibration geometry"
-msgstr ""
+msgid "length (m)"
+msgstr "дължина (м)"
 
-msgid "Store imagery offset"
-msgstr ""
+msgid "speed (km/h)"
+msgstr "скорост (км/ч)"
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
-msgstr ""
+msgid "weight (t)"
+msgstr "тегло (т)"
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
-msgstr ""
+msgid "axleload (t)"
+msgstr "маса на ос (т)"
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
-msgstr "Нормално"
-
-msgid "Rotate 90"
-msgstr "Завъртане на 90°"
-
-msgid "Rotate 180"
-msgstr "Завъртане на 180°"
+msgid "Max. incline down (%, pos.)"
+msgstr ""
 
-msgid "Rotate 270"
-msgstr "Завъртане на 270°"
+msgid "Maximum incline the vehicle can go down"
+msgstr ""
 
-msgid "Previous image"
-msgstr "Предишно изображение"
+msgid "Surface blacklist"
+msgstr ""
 
-msgid "Next image"
-msgstr "Следващо изображение"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
+msgstr ""
 
-msgid "Rotate left"
-msgstr "Завърти наляво"
+msgid "max. tracktype grade"
+msgstr ""
 
-msgid "Rotate image left"
-msgstr "Завърти изображението наляво"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgstr ""
 
-msgid "Rotate right"
-msgstr "Завърти надясно"
+msgid "Change bookmark"
+msgstr ""
 
-msgid "Rotate image right"
-msgstr "Завърти изображението надясно"
+msgid "Edit access parameters"
+msgstr ""
 
-msgid "WayPoint Image"
-msgstr "WayPoint изображение"
+msgid "Graph View Dialog"
+msgstr ""
 
-msgid "Display non-geotagged photos"
-msgstr "Показване на не-геомаркирани фотографии"
+msgid "Open the dialog for graph view configuration."
+msgstr ""
 
-msgid "Imported Images"
-msgstr "Импортирани изображения"
+msgid "default"
+msgstr ""
 
-msgid "Import vector graphics"
+msgid "end nodes"
 msgstr ""
 
-msgid "Scale:"
-msgstr "Мащаб:"
+msgid "incline"
+msgstr "наклон"
 
-msgid "unit(s) = "
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Parameters:"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
-msgstr ""
+msgid "Coloring:"
+msgstr "Оцветяване:"
 
-msgid "Please open or create data layer before importing"
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Graphview"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Ruleset"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Select directory"
 msgstr ""
 
-msgid "POWER"
-msgstr ""
+msgid "Vehicle"
+msgstr "Превозно средство"
 
-msgid "Activates the plug-in"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "Working Level"
+msgid "Visualization"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Level Name"
+msgid "Node color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark deletion"
 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>"
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose node color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview default node"
 msgstr ""
 
-msgid "GPX info mode"
+msgid "graphview default segment"
 msgstr ""
 
-msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "km/h"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
 msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Change Color"
 msgstr ""
 
-msgid "junctions"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "order of junction (n):"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
+msgstr ""
+
+msgid "Notifying the server of the deprecation..."
+msgstr ""
+
+msgid "Get Imagery Offset..."
+msgstr ""
+
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
 msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "create the channel digraph"
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "Check "
-msgstr "Проверка "
+msgid "Error processing XML response: {0}"
+msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Offset"
+msgstr "Отместване"
+
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid "Search "
-msgstr "Търсене "
+msgid "mm"
+msgstr "мм"
 
-msgid "search for junctions in the channel subset"
+msgid "cm"
+msgstr "см"
+
+msgid "km"
+msgstr "км"
+
+msgid "Calibration geometries"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid "Offset Information"
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "Report this offset"
 msgstr ""
 
-msgid "The starting location was not within the bbox"
-msgstr "Началното положение е извън границите на рамката"
+msgid "You are to notify moderators of this offset. Why?"
+msgstr ""
 
-msgid "Looking for shoreline..."
-msgstr "Търсене на бреговата линия..."
+msgid "Reporting the offset..."
+msgstr ""
 
-msgid "{0} nodes so far..."
-msgstr "{0} точки дотук..."
+msgid "An imagery offset of {0}"
+msgstr ""
 
-msgid "Lake Walker."
-msgstr "Lake Walker."
+msgid "Imagery ID"
+msgstr ""
 
-msgid "Lake Walker"
-msgstr "Трасиране на езера"
+msgid "A calibration geometry of {0} nodes"
+msgstr ""
 
-msgid "Error creating cache directory: {0}"
-msgstr "Грешка при създаване на кеш директория: {0}"
+msgid "Determined right here"
+msgstr ""
 
-msgid "Tracing"
-msgstr "Проследяване"
+msgid "Determined {0} away"
+msgstr ""
 
-msgid "checking cache..."
-msgstr "проверка на кеша..."
+msgid "Reason"
+msgstr ""
 
-msgid "Running vertex reduction..."
-msgstr "Опростяване на геометрията..."
+msgid "This entry has been reported."
+msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
-msgstr "Апроксимация Douglas-Peucker..."
+msgid "Server has rejected the request"
+msgstr "Сървърът отхвърли заявката"
 
-msgid "Removing duplicate nodes..."
-msgstr "Изтриване на повтарящи се точки..."
+msgid "Unable to connect to the server"
+msgstr ""
 
-msgid "Lakewalker trace"
-msgstr "Lakewalker трасиране"
+msgid "Store Imagery Offset..."
+msgstr ""
 
-msgid "An unknown error has occurred"
-msgstr "Възникна непозната грешка"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
+msgstr ""
 
-msgid "east"
-msgstr "изток"
+msgid "Store calibration geometry"
+msgstr ""
 
-msgid "northeast"
-msgstr "североизток"
+msgid "Store imagery offset"
+msgstr ""
 
-msgid "north"
-msgstr "север"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
+msgstr ""
 
-msgid "northwest"
-msgstr "северозапад"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
+msgstr ""
 
-msgid "west"
-msgstr "запад"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
+msgstr ""
 
-msgid "southwest"
-msgstr "югозапад"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
+msgstr ""
 
-msgid "south"
-msgstr "юг"
+msgid "Uploading a new offset..."
+msgstr ""
 
-msgid "southeast"
-msgstr "югоизток"
+msgid "This string should be 3 to 200 letters long."
+msgstr ""
 
-msgid "coastline"
-msgstr "брегова линия"
+msgid "Adjust imagery"
+msgstr ""
 
-msgid "land"
-msgstr "земя"
+msgid "Adjust the position of the selected imagery layer"
+msgstr ""
 
-msgid "Maximum number of segments per way"
-msgstr "Максимален брой сегменти за един път"
+msgid "Please select the imagery layer to adjust."
+msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
-msgstr "Максимален брой възли в началната следа"
+msgid "Start adjusting"
+msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
-msgstr "Най-светлия отенък на сивото, който да се смяната за вода (0-255)"
+msgid "There are currently no imagery layer to adjust."
+msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
-msgstr "Точно на опростяването на линии (в градуси)"
+msgid "No layers to adjust"
+msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr "Разрешителна способност на Landsat изображенията (точки на градус)"
+msgid "Normal"
+msgstr "Нормално"
 
-msgid "Size of Landsat tiles (pixels)"
-msgstr "Размер на Landsat изображенията (точки)"
+msgid "Rotate 90"
+msgstr "Завъртане на 90°"
 
-msgid "Shift all traces to east (degrees)"
-msgstr "Преместване всички следи на изток (в градуси)"
+msgid "Rotate 180"
+msgstr "Завъртане на 180°"
 
-msgid "Shift all traces to north (degrees)"
-msgstr "Преместване всички следи на север (в градуси)"
+msgid "Rotate 270"
+msgstr "Завъртане на 270°"
 
-msgid "Direction to search for land"
-msgstr "Посока в която да се търси земя"
+msgid "Previous image"
+msgstr "Предишно изображение"
 
-msgid "Tag ways as"
-msgstr "Маркирай пътищата като"
+msgid "Next image"
+msgstr "Следващо изображение"
 
-msgid "WMS Layer"
-msgstr "WMS Слой"
+msgid "Rotate left"
+msgstr "Завърти наляво"
 
-msgid "Maximum cache size (MB)"
-msgstr "Макс.размер на кеша (MB)"
+msgid "Rotate image left"
+msgstr "Завърти изображението наляво"
 
-msgid "Maximum cache age (days)"
-msgstr "Съхраняване кеш (дни)"
+msgid "Rotate right"
+msgstr "Завърти надясно"
 
-msgid "Source text"
-msgstr "Изходен текст"
+msgid "Rotate image right"
+msgstr "Завърти изображението надясно"
 
-msgid "Lakewalker Plugin Preferences"
-msgstr "Lakewalker Настройки на разширението"
+msgid "WayPoint Image"
+msgstr "WayPoint изображение"
 
-msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "Разширение за трасировка на водоеми по Landsat изображения."
+msgid "Display non-geotagged photos"
+msgstr "Показване на не-геомаркирани фотографии"
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
-msgstr "Максимален брой сегменти в създаваните линии. По подразбиране 250."
+msgid "Imported Images"
+msgstr "Импортирани изображения"
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Import vector graphics"
 msgstr ""
-"Максимален брой възли за генериране преди опростяване на линиите. По "
-"подразбиране 50000."
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
-"Най-светъл сив отенък, приеман като вода (базирано на Landsat IR-1 данни). "
-"Може да бъде 0-255. По подразбиране 90."
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Concourse wizard ..."
 msgstr ""
-"Точност на алгоритъма на Douglas-Peucker за опростяване на линии, измервана "
-"в градуси.<br>По-ниски стойности водят до повече възли и по-точни линии. По "
-"подразбиране 0.0003."
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
-"Резолюция на Landsat изображенията, в точки на градус. По подразбиране 4000."
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Vertical layer:"
 msgstr ""
-"Размер на landsat изображение, измервано в точки. По подразбиране 2000."
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "Structure type:"
 msgstr ""
-"Отместване на всички точки в посока Изток (градуси). По подразбиране 0."
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Offset into background:"
 msgstr ""
-"Отместване на всички точки в посока Север (градуси). По подразбиране 0."
-
-msgid "Direction to search for land. Default east."
-msgstr "Посока за търсене на земя. По подразбиране изток."
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Indoor Mapping Helper"
 msgstr ""
-"Маркирай линиите като вода, крайбрежие, земя или нищо. По подразбиране вода."
-
-msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr "Кой WMS слой да използваме за трасиране. По подразбиране IR1."
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "POWER"
 msgstr ""
-"Максимален размер на всяка кеш директория в байтове. По подразбиране 300MB"
-
-msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "Макс. възраст на всеки кеш файл (в дни). По подразбиране 100 дни."
 
-msgid "Data source text. Default is Landsat."
-msgstr "Източник на данни. По подразбиране Landsat."
+msgid "Activates the plug-in"
+msgstr ""
 
-msgid "Downloading image tile..."
-msgstr "Сваляне на квадрат с изображение..."
+msgid "Working Level"
+msgstr ""
 
-msgid "Could not acquire image"
-msgstr "Невъзможно да се получи изображение"
+msgid "Selects the working level."
+msgstr ""
 
-msgid "Connection Failed"
-msgstr "Неуспех при свързването"
+msgid "Level Name"
+msgstr ""
 
-msgid "Not connected"
-msgstr "Не сте свързан"
+msgid "Optional name-tag for a level."
+msgstr ""
 
-msgid "Connecting"
-msgstr "Свързване"
+msgid "The object preset you want to tag."
+msgstr ""
 
-msgid "Connected"
-msgstr "Свързан"
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
 
-msgid "no name"
-msgstr "няма име"
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
 
-msgid "Live GPS"
-msgstr "GPS на живо"
+msgid "Apply Tags"
+msgstr ""
 
-msgid "Show GPS data."
-msgstr "Показване GPS данни."
+msgid "Fitting"
+msgstr ""
 
-msgid "Status"
-msgstr "Състояние"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
 
-msgid "Way Info"
-msgstr "Информация за линия"
+msgid "Level Selection"
+msgstr ""
 
-msgid "Speed"
-msgstr "Скорост"
+msgid "Lowest Level"
+msgstr ""
 
-msgid "Course"
-msgstr "Курс"
+msgid "The lowest level of your building."
+msgstr ""
 
-msgid "LiveGPS layer"
-msgstr "LiveGPS слой"
+msgid "Highest Level"
+msgstr ""
 
-msgid "Capture GPS Track"
-msgstr "Записване на GPS следа"
+msgid "The highest level of your building."
+msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
-"Свързване с gpsd сървъра и показване на текущата позиция на слоя LiveGPS."
 
-msgid "Center Once"
-msgstr "Центриране веднъж"
+msgid "InfoMode"
+msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
-msgstr "Центриране на LiveGPS слоя към текущата позиция."
+msgid "GPX info mode"
+msgstr ""
 
-msgid "Auto-Center"
-msgstr "Авто-Център"
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
-msgstr "Постоянно центриране на LiveGPS слоя към текущата позиция."
+msgid "Delete this"
+msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "km/h"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "Track name: "
 msgstr ""
 
-msgid "Missing input data"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary Images"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "Total images:"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "images"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Mapillary"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Export images"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import local pictures"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Select pictures"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join mode"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit changeset"
-msgstr ""
+msgid "Check "
+msgstr "Проверка "
 
-msgid "Submit the current changeset"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
+msgid "Search "
+msgstr "Търсене "
 
-msgid "Upload pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Upload pictures."
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "View in website"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key"
+msgid "Wrong"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Edit on website"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Submit"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export all images"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Export selected images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "Replace way"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Select a directory"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Speed limit"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "Give way"
-msgstr ""
+msgid "The starting location was not within the bbox"
+msgstr "Началното положение е извън границите на рамката"
 
-msgid "No entry"
-msgstr ""
+msgid "Looking for shoreline..."
+msgstr "Търсене на бреговата линия..."
 
-msgid "Intersection danger"
-msgstr ""
+msgid "{0} nodes so far..."
+msgstr "{0} точки дотук..."
 
-msgid "Mandatory direction (any)"
-msgstr ""
+msgid "Lake Walker."
+msgstr "Lake Walker."
 
-msgid "Uneven road"
-msgstr ""
+msgid "Lake Walker"
+msgstr "Трасиране на езера"
 
-msgid "No parking"
-msgstr ""
+msgid "Error creating cache directory: {0}"
+msgstr "Грешка при създаване на кеш директория: {0}"
 
-msgid "No overtaking"
-msgstr ""
+msgid "Tracing"
+msgstr "Проследяване"
 
-msgid "Pedestrian crossing"
-msgstr ""
+msgid "checking cache..."
+msgstr "проверка на кеша..."
 
-msgid "No turn"
-msgstr ""
+msgid "Running vertex reduction..."
+msgstr "Опростяване на геометрията..."
 
-msgid "Years"
-msgstr ""
+msgid "Running Douglas-Peucker approximation..."
+msgstr "Апроксимация Douglas-Peucker..."
 
-msgid "Months"
-msgstr ""
+msgid "Removing duplicate nodes..."
+msgstr "Изтриване на повтарящи се точки..."
 
-msgid "Days"
-msgstr ""
+msgid "Lakewalker trace"
+msgstr "Lakewalker трасиране"
 
-msgid "Imported images"
-msgstr ""
+msgid "An unknown error has occurred"
+msgstr "Възникна непозната грешка"
 
-msgid "Mapillary filter"
-msgstr ""
+msgid "east"
+msgstr "изток"
 
-msgid "Open Mapillary filter dialog"
-msgstr ""
+msgid "northeast"
+msgstr "североизток"
 
-msgid "Not older than: "
-msgstr ""
+msgid "north"
+msgstr "север"
 
-msgid "Downloaded images"
-msgstr ""
+msgid "northwest"
+msgstr "северозапад"
 
-msgid "Only images with signs"
-msgstr ""
+msgid "west"
+msgstr "запад"
 
-msgid "Choose signs"
-msgstr ""
+msgid "southwest"
+msgstr "югозапад"
 
-msgid "Mapillary history"
-msgstr ""
+msgid "south"
+msgstr "юг"
 
-msgid "Open Mapillary history dialog"
-msgstr ""
+msgid "southeast"
+msgstr "югоизток"
 
-msgid "Mapillary picture"
-msgstr ""
+msgid "coastline"
+msgstr "брегова линия"
 
-msgid "Open Mapillary window"
-msgstr ""
+msgid "land"
+msgstr "земя"
 
-msgid "Mapillary dialog"
-msgstr ""
+msgid "Maximum number of segments per way"
+msgstr "Максимален брой сегменти за един път"
 
-msgid "Open Mapillary main dialog"
-msgstr ""
+msgid "Maximum number of nodes in initial trace"
+msgstr "Максимален брой възли в началната следа"
 
-msgid "Next picture"
-msgstr ""
+msgid "Maximum gray value to count as water (0-255)"
+msgstr "Най-светлия отенък на сивото, който да се смяната за вода (0-255)"
 
-msgid "Shows the next picture in the sequence"
-msgstr ""
+msgid "Line simplification accuracy (degrees)"
+msgstr "Точно на опростяването на линии (в градуси)"
 
-msgid "Previous picture"
-msgstr ""
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr "Разрешителна способност на Landsat изображенията (точки на градус)"
 
-msgid "Shows the previous picture in the sequence"
-msgstr ""
+msgid "Size of Landsat tiles (pixels)"
+msgstr "Размер на Landsat изображенията (точки)"
 
-msgid "Jump to red"
-msgstr ""
+msgid "Shift all traces to east (degrees)"
+msgstr "Преместване всички следи на изток (в градуси)"
 
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
+msgid "Shift all traces to north (degrees)"
+msgstr "Преместване всички следи на север (в градуси)"
 
-msgid "Jump to blue"
-msgstr ""
+msgid "Direction to search for land"
+msgstr "Посока в която да се търси земя"
 
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
+msgid "Tag ways as"
+msgstr "Маркирай пътищата като"
 
-msgid "Stops the walk."
-msgstr ""
+msgid "WMS Layer"
+msgstr "WMS Слой"
 
-msgid "Play"
-msgstr ""
+msgid "Maximum cache size (MB)"
+msgstr "Макс.размер на кеша (MB)"
 
-msgid "Continues with the paused walk."
-msgstr ""
+msgid "Maximum cache age (days)"
+msgstr "Съхраняване кеш (дни)"
 
-msgid "Pause"
-msgstr ""
+msgid "Source text"
+msgstr "Изходен текст"
 
-msgid "Pauses the walk."
-msgstr ""
+msgid "Lakewalker Plugin Preferences"
+msgstr "Lakewalker Настройки на разширението"
 
-msgid "Display hour when the picture was taken"
-msgstr ""
+msgid "A plugin to trace water bodies on Landsat imagery."
+msgstr "Разширение за трасировка на водоеми по Landsat изображения."
 
-msgid "Use 24 hour format"
-msgstr ""
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
+msgstr "Максимален брой сегменти в създаваните линии. По подразбиране 250."
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
+"Максимален брой възли за генериране преди опростяване на линиите. По "
+"подразбиране 50000."
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
+"Най-светъл сив отенък, приеман като вода (базирано на Landsat IR-1 данни). "
+"Може да бъде 0-255. По подразбиране 90."
 
-msgid "Download mode"
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
+"Точност на алгоритъма на Douglas-Peucker за опростяване на линии, измервана "
+"в градуси.<br>По-ниски стойности водят до повече възли и по-точни линии. По "
+"подразбиране 0.0003."
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
+"Резолюция на Landsat изображенията, в точки на градус. По подразбиране 4000."
 
-msgid "You are currently not logged in."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
+"Размер на landsat изображение, измервано в точки. По подразбиране 2000."
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
+"Отместване на всички точки в посока Изток (градуси). По подразбиране 0."
 
-msgid "Upload selected sequence"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
+"Отместване на всички точки в посока Север (градуси). По подразбиране 0."
 
-msgid "Delete after upload"
-msgstr ""
+msgid "Direction to search for land. Default east."
+msgstr "Посока за търсене на земя. По подразбиране изток."
 
-msgid "Wait for full quality pictures"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
+"Маркирай линиите като вода, крайбрежие, земя или нищо. По подразбиране вода."
 
-msgid "Follow selected image"
-msgstr ""
+msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgstr "Кой WMS слой да използваме за трасиране. По подразбиране IR1."
 
-msgid "Go forward"
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
+"Максимален размер на всяка кеш директория в байтове. По подразбиране 300MB"
 
-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 "Maximum age of each cached file in days. Default is 100"
+msgstr "Макс. възраст на всеки кеш файл (в дни). По подразбиране 100 дни."
 
-msgid "2 images joined"
-msgstr ""
+msgid "Data source text. Default is Landsat."
+msgstr "Източник на данни. По подразбиране Landsat."
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr "Сваляне на квадрат с изображение..."
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr "Невъзможно да се получи изображение"
 
-msgid "2 images unjoined"
-msgstr ""
+msgid "Connection Failed"
+msgstr "Неуспех при свързването"
 
-msgid "everything in the visible area"
-msgstr ""
+msgid "Not connected"
+msgstr "Не сте свързан"
 
-msgid "areas with downloaded OSM-data"
-msgstr ""
+msgid "Connecting"
+msgstr "Свързване"
 
-msgid "only when manually requested"
-msgstr ""
+msgid "Connected"
+msgstr "Свързан"
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
+msgid "no name"
+msgstr "няма име"
 
-msgid "Downloading"
-msgstr ""
+msgid "Live GPS"
+msgstr "GPS на живо"
 
-msgid "Select mode"
-msgstr ""
+msgid "Show GPS data."
+msgstr "Показване GPS данни."
 
-msgid "Mapillary login"
-msgstr ""
+msgid "Status"
+msgstr "Състояние"
 
-msgid "Login successful, return to JOSM."
-msgstr ""
+msgid "Way Info"
+msgstr "Информация за линия"
 
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
+msgid "Speed"
+msgstr "Скорост"
 
-msgid "Downloading Mapillary images"
-msgstr ""
+msgid "Course"
+msgstr "Курс"
 
-msgid "Total Mapillary images: {0}"
-msgstr ""
+msgid "LiveGPS layer"
+msgstr "LiveGPS слой"
 
-msgid "Submitting Mapillary Changeset"
-msgstr ""
+msgid "Capture GPS Track"
+msgstr "Записване на GPS следа"
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
+"Свързване с gpsd сървъра и показване на текущата позиция на слоя LiveGPS."
 
-msgid "Finished upload"
-msgstr ""
+msgid "Center Once"
+msgstr "Центриране веднъж"
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
+msgid "Center the LiveGPS layer to current position."
+msgstr "Центриране на LiveGPS слоя към текущата позиция."
 
-msgid "Not Logged in to Mapillary"
-msgstr ""
+msgid "Auto-Center"
+msgstr "Авто-Център"
 
-msgid "Uploading: {0}"
-msgstr ""
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr "Постоянно центриране на LiveGPS слоя към текущата позиция."
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29975,6 +30117,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "преместен"
+
 msgid "rail"
 msgstr "ЖП"
 
@@ -30070,9 +30215,6 @@ msgstr ""
 msgid "Join"
 msgstr "Присъедини"
 
-msgid "moved"
-msgstr "преместен"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -31089,6 +31231,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Разделяне на сграда"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31536,6 +31738,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Напред"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Няма такава лента."
 
@@ -32362,9 +32642,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32558,15 +32835,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "Напред"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index ee8a106..9c9487c 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:40+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: bn\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -205,18 +205,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "ত্রুটি"
-
-msgid "Select image format for WMS layer"
-msgstr ""
-
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr "স্তর যোগ করুন"
-
 msgid "Invalid service URL."
 msgstr ""
 
@@ -229,6 +217,18 @@ msgstr ""
 msgid "Could not parse WMS layer list."
 msgstr ""
 
+msgid "Error"
+msgstr "ত্রুটি"
+
+msgid "Select image format for WMS layer"
+msgstr ""
+
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr "স্তর যোগ করুন"
+
 msgid "Add Node..."
 msgstr "নোড যোগ করুন।"
 
@@ -3281,9 +3281,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3685,10 +3682,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3725,6 +3722,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3734,6 +3734,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3770,6 +3773,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3988,6 +3997,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4198,30 +4213,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4465,9 +4480,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4988,9 +5000,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6410,6 +6419,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6649,6 +6661,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7921,9 +7941,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8487,6 +8504,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8538,6 +8558,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8550,6 +8576,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10603,6 +10635,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12684,6 +12719,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13046,6 +13084,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14689,6 +14730,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14800,7 +14844,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14979,6 +15026,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15273,18 +15323,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15294,6 +15332,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15426,6 +15467,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15793,6 +15837,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15907,6 +15954,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16104,6 +16154,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16126,6 +16181,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16282,6 +16340,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17602,6 +17664,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19221,6 +19286,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19891,10 +19959,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19909,6 +19977,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20778,6 +20852,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20862,6 +20940,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23067,7 +23149,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23734,16 +23822,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23752,18 +23834,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23776,18 +23846,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23980,9 +24038,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23992,6 +24061,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24007,39 +24082,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24058,9 +24118,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24115,10 +24184,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24134,7 +24209,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24179,7 +24254,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24213,6 +24288,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24231,6 +24309,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24321,10 +24402,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24570,6 +24654,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24908,3267 +25013,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29630,6 +29772,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29725,9 +29870,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30739,6 +30881,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31186,6 +31388,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32012,9 +32292,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32208,15 +32485,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 478bf35..15b7683 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:42+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:37+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: br\n"
 
 msgid "License"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Fazi"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Fazi"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index a279923..56a5f31 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:41+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:37+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: bs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -205,28 +205,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Greška"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Greška"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3281,9 +3281,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3685,10 +3682,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3725,6 +3722,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3734,6 +3734,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3770,6 +3773,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3988,6 +3997,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4198,30 +4213,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4465,9 +4480,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4988,9 +5000,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6410,6 +6419,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6649,6 +6661,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7921,9 +7941,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8487,6 +8504,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8538,6 +8558,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8550,6 +8576,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10603,6 +10635,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12684,6 +12719,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13046,6 +13084,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14689,6 +14730,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14800,7 +14844,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14979,6 +15026,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15273,18 +15323,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15294,6 +15332,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15426,6 +15467,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15793,6 +15837,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15907,6 +15954,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16104,6 +16154,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16126,6 +16181,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16282,6 +16340,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17602,6 +17664,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19221,6 +19286,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19891,10 +19959,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19909,6 +19977,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20778,6 +20852,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20862,6 +20940,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23067,7 +23149,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23734,16 +23822,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23752,18 +23834,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23776,18 +23846,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23980,9 +24038,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23992,6 +24061,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24007,39 +24082,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24058,9 +24118,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24115,10 +24184,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24134,7 +24209,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24179,7 +24254,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24213,6 +24288,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24231,6 +24309,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24321,10 +24402,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24570,6 +24654,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24908,3267 +25013,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29630,6 +29772,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29725,9 +29870,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30739,6 +30881,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31186,6 +31388,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32012,9 +32292,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32208,15 +32485,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 8e9859c..1342b6d 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: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2016-04-05 12:55+0000\n"
 "Last-Translator: pitort <pitort at eclipso.eu>\n"
 "Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:44+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:39+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ca\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -213,18 +213,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Afegeix la capa d''imatge {0}"
 
-msgid "Error"
-msgstr "S''ha produït un error"
-
-msgid "Select image format for WMS layer"
-msgstr "Seleccioneu el format d''imatge de la capa WMS"
-
-msgid "Select WMS layers"
-msgstr "Selecciona capes WMS"
-
-msgid "Add layers"
-msgstr "Afegeix capes"
-
 msgid "Invalid service URL."
 msgstr "URL de servei no válida"
 
@@ -237,6 +225,18 @@ msgstr "No es pot recuperar la llista de capes WMS."
 msgid "Could not parse WMS layer list."
 msgstr "No es pot analitzar la llista de capes WMS."
 
+msgid "Error"
+msgstr "S''ha produït un error"
+
+msgid "Select image format for WMS layer"
+msgstr "Seleccioneu el format d''imatge de la capa WMS"
+
+msgid "Select WMS layers"
+msgstr "Selecciona capes WMS"
+
+msgid "Add layers"
+msgstr "Afegeix capes"
+
 msgid "Add Node..."
 msgstr "Afegeix un node..."
 
@@ -3595,9 +3595,6 @@ msgstr "Identificador del conjunt de matrius"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "No hi ha capes definides al document getCapabilities: {0}"
 
-msgid "No layer selected"
-msgstr "No heu seleccionat cap capa"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4044,12 +4041,12 @@ msgstr "Relacions múltiples de carrer associat (associatedStreet)"
 msgid "House number without street"
 msgstr "Número sense carrer"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Número de portal ''{0}'' duplicat"
-
 msgid "Duplicate house numbers"
 msgstr "Nombres de carrer duplicats"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Número de portal ''{0}'' duplicat"
+
 msgid "Multiple street names in relation"
 msgstr "Varis noms de carrer a la relació"
 
@@ -4086,6 +4083,9 @@ msgstr "Línia costanera"
 msgid "This test checks that coastlines are correct."
 msgstr "Aquest test comprova que les línies de costa són correctes"
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Línia de costa invertida: la terra no és al costat esquerre"
+
 msgid "Unconnected coastline"
 msgstr "Línia costanera no connectada"
 
@@ -4095,6 +4095,9 @@ msgstr "Línia de costa desordenada"
 msgid "Reversed coastline"
 msgstr "Línia de costa invertida"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "Claus condicionals"
 
@@ -4133,6 +4136,12 @@ msgstr "Encreuament de límits"
 msgid "Crossing barriers"
 msgstr "Encreuament de barreres"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4371,6 +4380,12 @@ msgstr "Rol no adequat per a un membre del multipolígon"
 msgid "Non-Way in multipolygon"
 msgstr "No hi ha vies al multipolígon"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Manca nom:* traducció"
 
@@ -4603,30 +4618,30 @@ msgstr "Els valors de la propietat cotenen múltiples espais o blancs"
 msgid "Property values contain HTML entity"
 msgstr "Els valors contenen codi HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "La clau ''{0}'' sembla ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Propietat de la clau mal escrita"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "La clau ''{0}'' no és ales predefinicions."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "La clau ''{0}'' sembla ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Les predefinicions no contenen la propietat de la clau"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "El valor ''{0}'' de la clau ''{1}'' apareix com ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "La clau ''{0}'' no és ales predefinicions."
 
 msgid "Misspelled property value"
 msgstr "Valor de la propietat mal escrit"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "El valor ''{0}'' per a la clau ''{1}'' no és a les predefinicions."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "El valor ''{0}'' de la clau ''{1}'' apareix com ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Les predefinicions no contenen valor"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "El valor ''{0}'' per a la clau ''{1}'' no és a les predefinicions."
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4881,9 +4896,6 @@ msgstr ""
 "Aquest test comprova la direcció d''un curs d''aigua, de la terra i de la "
 "línia costanera"
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Línia de costa invertida: la terra no és al costat esquerre"
-
 msgid "Reversed land: land not on left side"
 msgstr "Terra invertida: la terra no és al costat esquerrre"
 
@@ -5442,9 +5454,6 @@ msgstr "La longitud geogràfica a la posició del punter del ratolí."
 msgid "System of measurement changed to {0}"
 msgstr "El sistema de mesurament ha canviat a {0}"
 
-msgid "Layer not in list."
-msgstr "La capa no és a la llista."
-
 msgid "Default (open, closed, new)"
 msgstr "Predefinit (obre, tanca, nou)"
 
@@ -7011,6 +7020,9 @@ msgstr "Ordena les notes"
 msgid "Sort"
 msgstr "Ordenar"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tipus d''objecte:"
 
@@ -7266,6 +7278,14 @@ msgid "Download the content of the selected changesets from the server"
 msgstr ""
 "Baixar del servidor el contingut dels conjunts de canvis seleccionats"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "El meu conjunt de canvis"
 
@@ -8669,9 +8689,6 @@ msgstr "indiqueu el nom del lloc a cercar"
 msgid "Areas around places"
 msgstr "Àrea al voltant dels llocs"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Excepció de tipus NullPointer. Probablement manca algun atribut."
-
 msgid "Search ..."
 msgstr "Cerca..."
 
@@ -9313,6 +9330,9 @@ msgstr "Hi ha canvis sense guardar.Pujar / Guardar abans de sortir?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Hi ha canvis sense guardar.Pujar / Guardar abans d''esborrar-ho?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Pujant i guardant les capes modificades ..."
 
@@ -9382,6 +9402,12 @@ msgstr ""
 "Sortir del JOSM sense enregistrar. Els canvis pendents d''enregistrar es "
 "perdran."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Suprimir ara!"
 
@@ -9398,6 +9424,12 @@ msgstr ""
 "Tancar JOSM després de pujar/guardar. Els canvis pendents es "
 "pujaran/guardaran."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Fer accions abans de suprimir"
 
@@ -11733,6 +11765,9 @@ msgstr "Dibuixar fletxes de direcció única"
 msgid "Draw segment order numbers"
 msgstr "Mostrar nombres d''ordre de segment"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibuixar els límits de les dades baixades"
 
@@ -14051,6 +14086,9 @@ msgstr "Importació NMEA reeixida:"
 msgid "NMEA import failure!"
 msgstr "La importació NMEA ha fallat!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Excepció de tipus NullPointer. Probablement manca algun atribut."
+
 msgid "Note Files"
 msgstr "Arxius de notes"
 
@@ -14458,6 +14496,9 @@ msgstr "Pujant dades ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Trobat un objecte OSM amb ID zero"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "S''estan baixant les dades..."
 
@@ -16374,6 +16415,9 @@ msgstr "Tiris: DGM (MOdel del terreny)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Model de superfície)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viena: Mehrzweckkarte (propòsit general)"
 
@@ -16485,8 +16529,11 @@ msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16667,6 +16714,9 @@ msgstr "Imatgeria de drones 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Imatgeria de vehicel aeri no tripulat Canaan (Haiti) Novembre 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortofoto 2000"
 
@@ -16961,18 +17011,6 @@ msgstr "Freemap.sk Ciclisme"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Esquí"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Eslovàquia EEA GMES Atles urbà"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Eslovàquia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Mapes històrics d''Eslovàquia"
 
@@ -16982,6 +17020,9 @@ msgstr "RABA-KGZ: Eslovènia usos del sòl"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Eslovènia àrees edificades"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Sud-àfrica CD:NGI Aeri"
 
@@ -17114,6 +17155,9 @@ msgstr "Carreteres Servei Forestal USA"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ucraïna - Ortofotomapes 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -17509,6 +17553,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Baixa les dades OSM al llarg d''una via"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17655,6 +17702,9 @@ msgstr ""
 "crea un graf orientat de canals i verifica un subconjunt de canals si és un "
 "encreuament o una recerca d''encreuaments a un subconjunt de canals"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Ajuda a la vectorització d''imatges WMS"
 
@@ -17908,6 +17958,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Crea cases en filera a partir de blocs simples"
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17940,6 +17995,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Connector per signar digitalment dades OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18106,6 +18164,10 @@ msgid "No wheeled vehicle"
 msgstr "No apta per a vehicles amb rodes"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "pista/camp"
 
@@ -19435,6 +19497,9 @@ msgstr "construcció"
 msgid "Ford"
 msgstr "Gual"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Altres vies"
 
@@ -21080,6 +21145,9 @@ msgstr "Pista"
 msgid "Taxiway"
 msgstr "Pista de rodatge"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Heliport"
 
@@ -21752,11 +21820,11 @@ msgstr "Número del Punt"
 msgid "Point Name"
 msgstr "Nom del Punt"
 
-msgid "Phone Number"
-msgstr "Número de telèfon"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Utilitza el codi internacional, com +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinari"
@@ -21770,6 +21838,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr "Desfibril·lador automàtic"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Número de telèfon"
+
 msgid "Located inside a building?"
 msgstr "És a dins de l''edifici?"
 
@@ -22639,6 +22713,10 @@ msgid "university"
 msgstr "universitat"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "hospital"
 
@@ -22723,6 +22801,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Nivells"
 
@@ -24937,8 +25019,14 @@ msgstr "Reserva Natural"
 msgid "Scree"
 msgstr "Pedregar"
 
-msgid "An accumulation of loose rocks."
-msgstr "Una acumulació de roques i pedres soltes."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "Pastures"
@@ -25618,17 +25706,11 @@ msgstr "Rutes"
 msgid "Bicycle Route"
 msgstr "Ruta cliclista"
 
-msgid "icn"
-msgstr "Xarxa ciclista internacional"
-
-msgid "ncn"
-msgstr "Xarxa ciclista nacional"
-
-msgid "rcn"
-msgstr "Xarxa ciclista regional"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "Xarxa ciclista local"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Ruta de bicicleta de muntanya"
@@ -25636,18 +25718,6 @@ msgstr "Ruta de bicicleta de muntanya"
 msgid "Hiking Route"
 msgstr "Ruta excursionista"
 
-msgid "iwn"
-msgstr "Xarxa excursionista internacional"
-
-msgid "nwn"
-msgstr "Xarxa excursionista nacional"
-
-msgid "rwn"
-msgstr "Xarxa excursionista regional"
-
-msgid "lwn"
-msgstr "Xarxa excursionista local"
-
 msgid "infrastructure"
 msgstr "infraestructura"
 
@@ -25660,18 +25730,6 @@ msgstr "Ruta per a vianants"
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr "Pista"
 
@@ -25864,9 +25922,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr "El mateix valor de {0} i {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} sense {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} sense {1} o {2}"
 
@@ -25876,6 +25945,12 @@ msgstr "{0} sense {1}, {2} o {3}"
 msgid "{0} together with {1}"
 msgstr "{0} junt amb {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "objecte incomplet: només {0}"
 
@@ -25891,39 +25966,24 @@ msgstr "{0} amb {1} i valors conflictius"
 msgid "{0} on suspicious object"
 msgstr "{0} a un objecte sospitòs"
 
-msgid "restaurant without name"
-msgstr "restaurant sense nom"
-
-msgid "{0} used with {1}"
-msgstr "{0} usat amb {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "etiqueta \"aigua natural\" utilitzada a una piscina"
 
 msgid "sport without physical feature"
 msgstr "esport sense element físic"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} ha de ser al node on {1} i {2} es creuen"
-
 msgid "alternative name without {0}"
 msgstr "nom alternatiu sense {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "ús incomplet de {0} a una via sense {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "El mateix valor de {0} i {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "El mateix valor de {0}, {1} i {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} i {1} junt amb {2} i valors conflictius"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Combinació sospitosa d''etiquetes: {0} i {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25942,9 +26002,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} és obsolet"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' no té massa sentit, utilitzeu una etiqueta més específica, p.ex. "
@@ -26016,11 +26085,17 @@ msgstr "Etiqueta no especificada {0}"
 msgid "Definition of {0} is unclear"
 msgstr "La definició de {0} no és clara"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} no es recomana. Utilitzeu la funció Vies inverses del menú Eines."
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "clau amb caràcter estrany"
 
@@ -26036,7 +26111,7 @@ msgstr "{0} és obsolet per {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} és obsolet. Alternativament utilizeu el prefix de clau {1}."
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -26081,8 +26156,8 @@ msgstr "Àrees naturals idèntiques que se superposen"
 msgid "Overlapping Identical Landuses"
 msgstr "Usos de la terra idèntics que se superposen"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} ha d''estar connectat amb una via"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "el node connecta un curs d''aigua i un pont"
@@ -26115,6 +26190,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} ha de ser al node on {1} i {2} es creuen"
+
 msgid "abbreviated street name"
 msgstr "nom abreviat del carrer"
 
@@ -26133,6 +26211,9 @@ msgstr "via sense referència"
 msgid "temporary highway type"
 msgstr "via de tipus temporal"
 
+msgid "{0} used with {1}"
+msgstr "{0} usat amb {1}"
+
 msgid "street name contains ss"
 msgstr "el nom del carrer conté ss"
 
@@ -26231,11 +26312,14 @@ msgstr "denominació jueva sense especificar"
 msgid "{0} is unnecessary"
 msgstr "{0} no és necessari"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} no és necessari per {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} no té sentit"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Nodes que dupliquen els atributs de la via pare"
@@ -26497,6 +26581,27 @@ msgstr "Pujant recorregut en GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Puja traçats a openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Important..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "Si us plau, obriu o creeu una capa de dades abans d''importar"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Escala:"
+
+msgid "unit(s) = "
+msgstr "unitat(s) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Mostra el perfil d''alçada"
 
@@ -26853,6 +26958,405 @@ 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 "Total images:"
+msgstr "Imatges totals:"
+
+msgid "images"
+msgstr "imatges"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Crea una capa de Mapillary"
+
+msgid "Start Mapillary layer"
+msgstr "Inicia una capa de 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 "Select pictures"
+msgstr "Seleccioneu imatges"
+
+msgid "Import pictures into sequence"
+msgstr "Importa imatges a la seqüència"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importa fotografies a la capa de Mapillary en una seqüència"
+
+msgid "Join mode"
+msgstr "Afegeix mode"
+
+msgid "Join/unjoin pictures"
+msgstr "Afegeix/treu fotografies"
+
+msgid "Join Mapillary pictures"
+msgstr "Afegeix fotografies de Mapillary"
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr "Puja fotografies"
+
+msgid "Upload Mapillary pictures"
+msgstr "Puja fotografies de Mapillary"
+
+msgid "Upload pictures."
+msgstr "Puja fotografies."
+
+msgid "Walk mode"
+msgstr "Mode caminant"
+
+msgid "Start walk mode"
+msgstr "Inicial el \"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 "View in website"
+msgstr "Veure-ho al lloc web"
+
+msgid "Copy key"
+msgstr "Copia clau"
+
+msgid "Copy key tag"
+msgstr "Copia l''etiqueta de la clau"
+
+msgid "Edit on website"
+msgstr "Modifica al lloc web"
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+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 folder"
+msgstr "Seleccioneu una carpeta"
+
+msgid "Explore"
+msgstr "Explora"
+
+msgid "Select a directory"
+msgstr "Seleccioneu un directori"
+
+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 "Mapillary picture"
+msgstr "Fotografia de Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Obre una finestra de Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Diàleg de  Mapillary"
+
+msgid "Open Mapillary main dialog"
+msgstr "Obre el diàleg prinicipal 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 "Login"
+msgstr "Inici de sessió"
+
+msgid "Logout"
+msgstr "Tanca la sessió"
+
+msgid "Download mode"
+msgstr "Mode de descàrrega"
+
+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 "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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr "La clau d''imatge ''{0}'' no és vàlida!"
+
+msgid "The image key must not be null here!"
+msgstr "La clau d''imatge no por ser un nul aquí!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "La clau se seqüència ''{0}'' no és vàlida!"
+
+msgid "The sequence key must not be null here!"
+msgstr "La clau de seqüència no por ser un nul aquí!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28733,9 +29237,6 @@ 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ó"
 
@@ -28768,9 +29269,6 @@ msgstr "Xat privat"
 msgid "Close tab"
 msgstr "Tanca la pestanya"
 
-msgid "Logout"
-msgstr "Tanca la sessió"
-
 msgid "Clear log"
 msgstr "Neteja el registre"
 
@@ -29360,9 +29858,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29556,21 +30051,9 @@ msgstr "Imatges importades"
 msgid "Import vector graphics"
 msgstr "Importa gràfics vectorials"
 
-msgid "Scale:"
-msgstr "Escala:"
-
-msgid "unit(s) = "
-msgstr "unitat(s) = "
-
-msgid "Importing..."
-msgstr "Important..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "Fitxers SVG [Connector ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Si us plau, obriu o creeu una capa de dades abans d''importar"
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29786,6 +30269,61 @@ msgstr "Nombre de cruïlles de {0} vies trobades: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "genera totes les combinacions de candidats entrada/sortida"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Reemplaçar geometria"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Índex de direcció ''{0}'' no trobat"
 
@@ -30052,404 +30590,6 @@ msgstr "Activa el connector de generació de llistats de problemes de MapDust"
 msgid "Missing input data"
 msgstr "Manquen dades"
 
-msgid "Mapillary Images"
-msgstr "Imatges de Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Capa de Mapillary"
-
-msgid "Total images:"
-msgstr "Imatges totals:"
-
-msgid "images"
-msgstr "imatges"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Crea una capa de Mapillary"
-
-msgid "Start Mapillary layer"
-msgstr "Inicia una capa de 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 "Select pictures"
-msgstr "Seleccioneu imatges"
-
-msgid "Import pictures into sequence"
-msgstr "Importa imatges a la seqüència"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importa fotografies a la capa de Mapillary en una seqüència"
-
-msgid "Join mode"
-msgstr "Afegeix mode"
-
-msgid "Join/unjoin pictures"
-msgstr "Afegeix/treu fotografies"
-
-msgid "Join Mapillary pictures"
-msgstr "Afegeix fotografies de Mapillary"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr "Puja fotografies"
-
-msgid "Upload Mapillary pictures"
-msgstr "Puja fotografies de Mapillary"
-
-msgid "Upload pictures."
-msgstr "Puja fotografies."
-
-msgid "Walk mode"
-msgstr "Mode caminant"
-
-msgid "Start walk mode"
-msgstr "Inicial el \"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 "Uploaded {0} images"
-msgstr "Han estat pujades {0} imatges"
-
-msgid "Approve upload on the website"
-msgstr "Approva la pujada al lloc web"
-
-msgid "View in website"
-msgstr "Veure-ho al lloc web"
-
-msgid "Copy key"
-msgstr "Copia clau"
-
-msgid "Copy key tag"
-msgstr "Copia l''etiqueta de la clau"
-
-msgid "Edit on website"
-msgstr "Modifica al lloc web"
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-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 folder"
-msgstr "Seleccioneu una carpeta"
-
-msgid "Explore"
-msgstr "Explora"
-
-msgid "Select a directory"
-msgstr "Seleccioneu un directori"
-
-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 "Mapillary picture"
-msgstr "Fotografia de Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Obre una finestra de Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Diàleg de  Mapillary"
-
-msgid "Open Mapillary main dialog"
-msgstr "Obre el diàleg prinicipal 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 "Download mode"
-msgstr "Mode de descàrrega"
-
-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 "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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"L''àrea descarregada d''OSM és massa gran. S''ha canviat el mode de "
-"descàrrega a semi-automàtic fins que la capa sigui reinicialitzada."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr "La clau d''imatge ''{0}'' no és vàlida!"
-
-msgid "The image key must not be null here!"
-msgstr "La clau d''imatge no por ser un nul aquí!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "La clau se seqüència ''{0}'' no és vàlida!"
-
-msgid "The sequence key must not be null here!"
-msgstr "La clau de seqüència no por ser un nul aquí!"
-
 msgid "Measured values"
 msgstr "Valors mesurats"
 
@@ -32017,6 +32157,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "mogut"
+
 msgid "rail"
 msgstr "via fèrria"
 
@@ -32114,9 +32257,6 @@ msgstr "Capta"
 msgid "Join"
 msgstr "Entra"
 
-msgid "moved"
-msgstr "mogut"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Transport públic: afegeix parades GTFS"
 
@@ -33183,6 +33323,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terrassa"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr "A corregir"
 
@@ -33662,6 +33862,84 @@ msgstr "Escolliu una data d''expiració per a la clau:"
 msgid "Create a new signing key"
 msgstr "Crear una nova clau de signatura"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Reenvia"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Endarrere"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "No existeix el carril"
 
@@ -34634,9 +34912,6 @@ msgstr "Cerca primitives amb aquestes etiquetes"
 msgid "Multitag Background: highlight"
 msgstr "Etiquetes múltiples de fons: ressaltades"
 
-msgid "Replace Geometry"
-msgstr "Reemplaçar geometria"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Reemplaçar la geometria de l''objecte seleccionat per una de nova"
 
@@ -34852,15 +35127,9 @@ msgstr "inicia/pausa la reproducció de vídeo"
 msgid "Video: {0}"
 msgstr "Vídeo: {0}"
 
-msgid "Backward"
-msgstr "Endarrere"
-
 msgid "jumps n sec back"
 msgstr "salta n segons enrera"
 
-msgid "Forward"
-msgstr "Reenvia"
-
 msgid "jumps n sec forward"
 msgstr "salta n segons endavant"
 
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index ab46a5b..9df2780 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:54+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:19+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ca at valencia\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -209,18 +209,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Afig la capa d''imatge {0}"
 
-msgid "Error"
-msgstr "S''ha produït un error"
-
-msgid "Select image format for WMS layer"
-msgstr "Seleccioneu el format d''imatge de la capa WMS"
-
-msgid "Select WMS layers"
-msgstr "Selecciona capes WMS"
-
-msgid "Add layers"
-msgstr "Afig capes"
-
 msgid "Invalid service URL."
 msgstr "URL de servei no válida"
 
@@ -233,6 +221,18 @@ msgstr "No es pot recuperar la llista de capes WMS."
 msgid "Could not parse WMS layer list."
 msgstr "No es pot analitzar la llista de capes WMS."
 
+msgid "Error"
+msgstr "S''ha produït un error"
+
+msgid "Select image format for WMS layer"
+msgstr "Seleccioneu el format d''imatge de la capa WMS"
+
+msgid "Select WMS layers"
+msgstr "Selecciona capes WMS"
+
+msgid "Add layers"
+msgstr "Afig capes"
+
 msgid "Add Node..."
 msgstr "Afig un node..."
 
@@ -3552,9 +3552,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3993,12 +3990,12 @@ msgstr "Relacions múltiples de carrer associat (associatedStreet)"
 msgid "House number without street"
 msgstr "Número sense carrer"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Número de portal ''{0}'' duplicat"
-
 msgid "Duplicate house numbers"
 msgstr "Nombres de carrer duplicats"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Número de portal ''{0}'' duplicat"
+
 msgid "Multiple street names in relation"
 msgstr "Varis noms de carrer a la relació"
 
@@ -4033,6 +4030,9 @@ msgstr "Línia costanera"
 msgid "This test checks that coastlines are correct."
 msgstr "Este test comprova que les línies de costa són correctes"
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Línia de costa invertida: la terra no és al costat esquerre"
+
 msgid "Unconnected coastline"
 msgstr "Línia costanera no connectada"
 
@@ -4042,6 +4042,9 @@ msgstr "Línia de costa desordenada"
 msgid "Reversed coastline"
 msgstr "Línia de costa invertida"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -4078,6 +4081,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4304,6 +4313,12 @@ msgstr "Rol no adequat per a un membre del multipolígon"
 msgid "Non-Way in multipolygon"
 msgstr "No hi ha vies al multipolígon"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Manca nom:* traducció"
 
@@ -4528,30 +4543,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Els valors contenen codi HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
-msgstr "La clau ''{0}'' no és ales predefinicions."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr "Les predefinicions no contenen la propietat de la clau"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr ""
+msgid "Key ''{0}'' not in presets."
+msgstr "La clau ''{0}'' no és ales predefinicions."
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "El valor ''{0}'' per a la clau ''{1}'' no és a les predefinicions."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr "Les predefinicions no contenen valor"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "El valor ''{0}'' per a la clau ''{1}'' no és a les predefinicions."
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4803,9 +4818,6 @@ msgstr ""
 "Este test comprova la direcció d''un curs d''aigua, de la terra i de la "
 "línia costanera"
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Línia de costa invertida: la terra no és al costat esquerre"
-
 msgid "Reversed land: land not on left side"
 msgstr "Terra invertida: la terra no és al costat esquerrre"
 
@@ -5339,9 +5351,6 @@ msgstr "La longitud geogràfica a la posició del punter del ratolí."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "La capa no és a la llista."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6847,6 +6856,9 @@ msgstr ""
 msgid "Sort"
 msgstr "Ordenar"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tipus d''objecte:"
 
@@ -7095,6 +7107,14 @@ msgid "Download the content of the selected changesets from the server"
 msgstr ""
 "Descarregar del servidor el contingut dels conjunts de canvis seleccionats"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "El meu conjunt de canvis"
 
@@ -8496,9 +8516,6 @@ msgstr "indiqueu el nom del lloc a cercar"
 msgid "Areas around places"
 msgstr "Àrea al voltant dels llocs"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Excepció de tipus NullPointer. Probablement manca algun atribut."
-
 msgid "Search ..."
 msgstr "Cerca..."
 
@@ -9146,6 +9163,9 @@ msgstr ""
 "Hi ha canvis sense enregistrar. Els voleu enregistrar o pujar abans de "
 "suprimir?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Pujant i enregistrat les capes modificades ..."
 
@@ -9215,6 +9235,12 @@ msgstr ""
 "Eixir de JOSM sense enregistrar. Els canvis pendents d''enregistrar es "
 "perdran."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Suprimir ara!"
 
@@ -9230,6 +9256,12 @@ msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 "Tancar JOSM enregsitrant. Els canvis pendent són pujats o enregistrats."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Fer accions abans de suprimir"
 
@@ -11563,6 +11595,9 @@ msgstr "Dibuixar fletxes de direcció única"
 msgid "Draw segment order numbers"
 msgstr "Mostrar nombres d''orde de segment"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibuixar els límits de les dades descarregades"
 
@@ -13858,6 +13893,9 @@ msgstr "Importació NMEA reeixida:"
 msgid "NMEA import failure!"
 msgstr "La importació NMEA ha fallat!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Excepció de tipus NullPointer. Probablement manca algun atribut."
+
 msgid "Note Files"
 msgstr ""
 
@@ -14263,6 +14301,9 @@ msgstr "Pujant dades ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Trobat un objecte OSM amb ID zero"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "S''estan descarregant les dades..."
 
@@ -16160,6 +16201,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -16271,7 +16315,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -16450,6 +16497,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16744,18 +16794,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -16765,6 +16803,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -16897,6 +16938,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -17282,6 +17326,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Descarrega dades OSM al llarg d''una via"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17419,6 +17466,9 @@ msgstr ""
 "crea un graf orientat de canals i verifica un subconjunt de canals si és un "
 "encreuament o una recerca d''encreuaments a un subconjunt de canals"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Ajuda a la vectorització d''imatges WMS"
 
@@ -17653,6 +17703,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Crea cases en filera a partir de blocs simples"
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17681,6 +17736,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Connector per signar digitalment dades OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17847,6 +17905,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "pista/camp"
 
@@ -19167,6 +19229,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Gual"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Altres vies"
 
@@ -20803,6 +20868,9 @@ msgstr "Pista"
 msgid "Taxiway"
 msgstr "Pista de rodatge"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Heliport"
 
@@ -21473,11 +21541,11 @@ msgstr "Número del Punt"
 msgid "Point Name"
 msgstr "Nom del Punt"
 
-msgid "Phone Number"
-msgstr "Número de telèfon"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Utilitza el codi internacional, com +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinari"
@@ -21491,6 +21559,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr "Desfibril·lador automàtic"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Número de telèfon"
+
 msgid "Located inside a building?"
 msgstr "És a dins de l''edifici?"
 
@@ -22360,6 +22434,10 @@ msgid "university"
 msgstr "universitat"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "hospital"
 
@@ -22444,6 +22522,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -24649,7 +24731,13 @@ msgstr "Reserva Natural"
 msgid "Scree"
 msgstr "Pedregar"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -25316,16 +25404,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -25334,18 +25416,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -25358,18 +25428,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -25562,9 +25620,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -25574,6 +25643,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -25589,39 +25664,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr "restaurant sense nom"
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr "etiqueta \"aigua natural\" utilitzada a una piscina"
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25640,9 +25700,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} és obsolet"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -25697,10 +25766,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -25716,7 +25791,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25761,7 +25836,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -25795,6 +25870,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr "nom abreviat del carrer"
 
@@ -25813,6 +25891,9 @@ msgstr "via sense referència"
 msgid "temporary highway type"
 msgstr "via de tipus temporal"
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr "el nom del carrer conté ss"
 
@@ -25903,10 +25984,13 @@ msgstr "denominació jueva sense especificar"
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -26163,6 +26247,27 @@ msgstr "Pujant recorregut en GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Puja traçats a openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Important..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "Per favor, obriu o creeu una capa de dades abans d''importar"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Escala:"
+
+msgid "unit(s) = "
+msgstr "unitat(s) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Mostra el perfil d''alçada"
 
@@ -26519,6 +26624,403 @@ 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 "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr ""
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr ""
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr "Inici de sessió"
+
+msgid "Logout"
+msgstr "Tanca la sessió"
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28366,9 +28868,6 @@ 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ó"
 
@@ -28401,9 +28900,6 @@ msgstr "Xat privat"
 msgid "Close tab"
 msgstr "Tanca la pestanya"
 
-msgid "Logout"
-msgstr "Tanca la sessió"
-
 msgid "Clear log"
 msgstr "Neteja el registre"
 
@@ -28992,9 +29488,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29187,21 +29680,9 @@ msgstr "Imatges importades"
 msgid "Import vector graphics"
 msgstr "Importa gràfics vectorials"
 
-msgid "Scale:"
-msgstr "Escala:"
-
-msgid "unit(s) = "
-msgstr "unitat(s) = "
-
-msgid "Importing..."
-msgstr "Important..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "Fitxers SVG [Connector ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Per favor, obriu o creeu una capa de dades abans d''importar"
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29417,6 +29898,61 @@ msgstr "Nombre de cruïlles de {0} vies trobades: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "genera totes les combinacions de candidats entrada/eixida"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Reemplaçar geometria"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Índex de direcció ''{0}'' no trobat"
 
@@ -29683,400 +30219,6 @@ msgstr "Activa el connector de generació de llistats de problemes de MapDust"
 msgid "Missing input data"
 msgstr "Manquen dades"
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Valors mesurats"
 
@@ -31641,6 +31783,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "mogut"
+
 msgid "rail"
 msgstr "via fèrria"
 
@@ -31738,9 +31883,6 @@ msgstr "Capta"
 msgid "Join"
 msgstr "Entra"
 
-msgid "moved"
-msgstr "mogut"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Transport públic: afig parades GTFS"
 
@@ -32806,6 +32948,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terrassa"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -33276,6 +33478,84 @@ msgstr "Escolliu una data d''expiració per a la clau:"
 msgid "Create a new signing key"
 msgstr "Crear una nova clau de signatura"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Reenvia"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Arrere"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "No existeix el carril"
 
@@ -34240,9 +34520,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Reemplaçar geometria"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Reemplaçar la geometria de l''objecte seleccionat per una de nova"
 
@@ -34458,15 +34735,9 @@ msgstr "inicia/pausa la reproducció de vídeo"
 msgid "Video: {0}"
 msgstr "Vídeo: {0}"
 
-msgid "Backward"
-msgstr "Arrere"
-
 msgid "jumps n sec back"
 msgstr "salta n segons enrera"
 
-msgid "Forward"
-msgstr "Reenvia"
-
 msgid "jumps n sec forward"
 msgstr "salta n segons avant"
 
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 521b8a1..2cbcdf6 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-29 07:48+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-10-26 12:26+0000\n"
 "Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
 "Language-Team: Czech <kde-i18n-doc at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:45+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:39+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: cs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -215,18 +215,6 @@ msgstr "Přidá vybrané prvky na mapě do výběru výše."
 msgid "Add imagery layer {0}"
 msgstr "Přidat vrstvu podkladových map {0}"
 
-msgid "Error"
-msgstr "Chyba"
-
-msgid "Select image format for WMS layer"
-msgstr "Zvolit formát obrazu vrstvy WMS"
-
-msgid "Select WMS layers"
-msgstr "Vybrat WMS vrstvy"
-
-msgid "Add layers"
-msgstr "Přidat vrstvy"
-
 msgid "Invalid service URL."
 msgstr "Neplatné URL služby."
 
@@ -239,6 +227,18 @@ msgstr "Nepodařilo se získat seznam WMS vrstev."
 msgid "Could not parse WMS layer list."
 msgstr "Nepodařilo se analyzovat seznam WMS vrstev."
 
+msgid "Error"
+msgstr "Chyba"
+
+msgid "Select image format for WMS layer"
+msgstr "Zvolit formát obrazu vrstvy WMS"
+
+msgid "Select WMS layers"
+msgstr "Vybrat WMS vrstvy"
+
+msgid "Add layers"
+msgstr "Přidat vrstvy"
+
 msgid "Add Node..."
 msgstr "Přidat uzel..."
 
@@ -3594,9 +3594,6 @@ msgstr "Identifikátor množiny matic"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Dokument getCapabilities nedefinuje žádné vrstvy: {0}"
 
-msgid "No layer selected"
-msgstr "Není zvolena žádná vrstva"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4026,12 +4023,12 @@ msgstr "Více relací \"přiřazená ulice\" (associatedStreet)"
 msgid "House number without street"
 msgstr "Číslo domu bez ulice"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Číslo domu ''{0}'' je duplicitní"
-
 msgid "Duplicate house numbers"
 msgstr "Duplicitní čísla domů"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Číslo domu ''{0}'' je duplicitní"
+
 msgid "Multiple street names in relation"
 msgstr "Více názvů ulic v jedné relaci"
 
@@ -4067,6 +4064,9 @@ msgstr "Linie pobřeží"
 msgid "This test checks that coastlines are correct."
 msgstr "Tento test kontroluje správnost linií pobřeží."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Obrácené pobřeží: země není na levé straně"
+
 msgid "Unconnected coastline"
 msgstr "Nespojená pobřežní linie"
 
@@ -4076,6 +4076,9 @@ msgstr "Neuspořádané pobřeží"
 msgid "Reversed coastline"
 msgstr "Obrácená pobřežní linie"
 
+msgid "invalid coastline"
+msgstr "neplatné pobřeží"
+
 msgid "Conditional Keys"
 msgstr "Podmínkové klíče"
 
@@ -4112,6 +4115,12 @@ msgstr "Křížící se hranice"
 msgid "Crossing barriers"
 msgstr "Křížící se překážky"
 
+msgid "Self crossing"
+msgstr "Sebekřížící"
+
+msgid "Self-crossing ways"
+msgstr "Cesty křížící samy sebe"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4347,6 +4356,12 @@ msgstr "Žádná použitelná role členu multipolygonu"
 msgid "Non-Way in multipolygon"
 msgstr "Ne-cesta v multipolygonu"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr "Člen(y) mulitpolygonu opakovány s různými rolemi"
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr "Člen(y) mulitpolygonu opakovány se stejnými rolemi"
+
 msgid "Missing name:* translation"
 msgstr "Chybějící překlad značky name:*"
 
@@ -4569,30 +4584,30 @@ msgstr "Hodnoty vlastností obsahují vícero mezer"
 msgid "Property values contain HTML entity"
 msgstr "Hodnota obsahuje HTML entitu"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Klíč ''{0}'' vypadá jako ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Překlep v klíči vlastnosti"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Klíč ''{0}'' se nenachází mezi předvolbami."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Klíč ''{0}'' vypadá jako ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Předvolby neobsahují použitý klíč"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Hodnota ''{0}'' klíče ''{1}'' vypadá jako ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Klíč ''{0}'' se nenachází mezi předvolbami."
 
 msgid "Misspelled property value"
 msgstr "Překlep v hodnotě vlastnosti"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Hodnota ''{0}'' klíče ''{1}'' není v předvolbách"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Hodnota ''{0}'' klíče ''{1}'' vypadá jako ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Předvolby neobsahují použitou hodnotu"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Hodnota ''{0}'' klíče ''{1}'' není v předvolbách"
+
 msgid "FIXMES"
 msgstr "OPRAVIT"
 
@@ -4840,9 +4855,6 @@ msgstr "Špatně seřazené cesty"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Tento test kontroluje směr vodních, zemních a pobřežních linií."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Obrácené pobřeží: země není na levé straně"
-
 msgid "Reversed land: land not on left side"
 msgstr "Obrácená země: země není na levé straně"
 
@@ -5399,9 +5411,6 @@ msgstr "Zeměpisná délka v místě kurzoru myši."
 msgid "System of measurement changed to {0}"
 msgstr "Systém měr byl změněn na {0}"
 
-msgid "Layer not in list."
-msgstr "Vrstva není v seznamu."
-
 msgid "Default (open, closed, new)"
 msgstr "Výchozí (otevřené, zavřené, nové)"
 
@@ -6958,6 +6967,9 @@ msgstr "Seřadit poznámky"
 msgid "Sort"
 msgstr "Řadit"
 
+msgid "Open the note in an external browser"
+msgstr "Otevřít poznámku v externím prohlížeči"
+
 msgid "Object type:"
 msgstr "Typ objektu:"
 
@@ -7206,6 +7218,14 @@ msgstr "Stáhnout obsah sady změn"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Stáhnout obsah vybraných sad změn ze serveru"
 
+msgid "Download changed objects"
+msgstr "Stáhnout změněné objekty"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr "Stáhnout aktuální verzi změněných objektů ve vybraných sadách změn"
+
 msgid "My changesets"
 msgstr "Mé sady změn"
 
@@ -8577,9 +8597,6 @@ msgstr "Zadejte název hledaného místa"
 msgid "Areas around places"
 msgstr "Oblast v okolí místa"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Výjimka desetinné čárky, pravděpodobně nějaké chybějící značky."
-
 msgid "Search ..."
 msgstr "Hledat ..."
 
@@ -9221,6 +9238,9 @@ msgstr "Neuložené změny - Uložit/nahrát na server před ukončením?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Neuložené změny - Uložit/nahrát na server před smazáním?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "Neuložené změny - Uložit/Nahrát na server před restartováním?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Ukládám a nahrávám na server změněné vrstvy ..."
 
@@ -9299,6 +9319,12 @@ msgstr "Ukončit okamžitě!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Ukončit JOSM bez ukládání. Neuložené změny budou ztraceny."
 
+msgid "Restart now!"
+msgstr "Restartovat ihned!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr "Restartovat JOSM bez uložení. Neuložené změny jsou ztraceny."
+
 msgid "Delete now!"
 msgstr "Smazat teď!"
 
@@ -9313,6 +9339,14 @@ msgstr ""
 "Ukončit JOSM s uložením. Neuložené změny budou nahrány na server a/nebo "
 "uloženy."
 
+msgid "Perform actions before restarting"
+msgstr "Provést akce před restartováním"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+"Restartovat JOSM s uložením. Neuložené změny jsou nahrány na server a/nebo "
+"uloženy."
+
 msgid "Perform actions before deleting"
 msgstr "Před smazáním provést akce"
 
@@ -11624,6 +11658,9 @@ msgstr "Kreslit šipky ve směru jízdy v jednosměrných silnicích"
 msgid "Draw segment order numbers"
 msgstr "Vykreslit pořadová čísla úseků"
 
+msgid "Draw segment order numbers on selected way"
+msgstr "Vykreslit pořadová čísla segmentů na vybranou cestu"
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykreslit ohraničující box stažených dat"
 
@@ -13889,6 +13926,9 @@ msgstr "Import NMEA úspěšný:"
 msgid "NMEA import failure!"
 msgstr "NMEA import selhal!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Výjimka desetinné čárky, pravděpodobně nějaké chybějící značky."
+
 msgid "Note Files"
 msgstr "Soubory poznámek"
 
@@ -14280,6 +14320,9 @@ msgstr "Nahrávám data na server ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Nalezeno neočekávané id 0 základního OSM objektu"
 
+msgid "Failed to evaluate {0}"
+msgstr "Selhalo vyhodnocení {0}"
+
 msgid "Downloading data..."
 msgstr "Stahuji data..."
 
@@ -16216,6 +16259,9 @@ msgstr "Tiris: DGM (model terénu)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (model povrchu)"
 
+msgid "Tiris: contour lines"
+msgstr "Tiris: obrysové linie"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (obecná)"
 
@@ -16327,8 +16373,11 @@ msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr "SDFE Overflade Skyggekort (40 cm)"
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16508,6 +16557,9 @@ msgstr "Drone Imagery 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drone Imagery Canaan(Haiti) November 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortophoto 2000"
 
@@ -16802,18 +16854,6 @@ msgstr "Freemap.sk Cyklo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Lyže"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrální mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrální mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovensko EEA GMES městská mapa"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovensko EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovensko historické mapy"
 
@@ -16823,6 +16863,9 @@ msgstr "RABA-KGZ: Slovenia farmland use"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slovenia built-up areas"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "City of Cape Town 2015 Aerial"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Jižní Afrika CD:NGI Letecká"
 
@@ -16955,6 +16998,9 @@ msgstr "U.S. Forest Service roads"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Ukraine - Kyiv 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -17350,6 +17396,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Stažení dat z OSM podél vybrané cesty"
 
+msgid "Dxf Import"
+msgstr "Dxf Import"
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17495,6 +17544,9 @@ msgstr ""
 "vytváří orientovaný graf možných průjezdů křižovatkou, který usnadňuje její "
 "kontrolu"
 
+msgid "Tools to help import Kartverket N50"
+msgstr "Nástroje pro pomoc při importu Kartverket N50"
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 "Vektrorizuje hranice souše a vody ze snímků družice Landsat, pásmo IR. "
@@ -17740,6 +17792,13 @@ msgstr ""
 "Rozděluje jednu plochu domu na jednotlivé části (garáže, řadové domy)."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+"Přidá dialog seznamu věcí k udělání, který zjednodušuje procházení velkých "
+"seznamů objektů"
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17769,6 +17828,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Doplněk pro digitální podepisování dat OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr "Editor pro přidávání značek odbočování jízdních pruhů na silnice"
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr "Poskytuje jednoduché GUI pro přidávání a úpravy odbočovacích pruhů."
@@ -17936,6 +17998,10 @@ msgid "No wheeled vehicle"
 msgstr "Žádné kolové vozidlo"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr "jízda na koni"
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "dráha"
 
@@ -19264,6 +19330,9 @@ msgstr "výstavba"
 msgid "Ford"
 msgstr "Brod"
 
+msgid "stepping_stones"
+msgstr "nášlapné kameny"
+
 msgid "Ways"
 msgstr "Cesty"
 
@@ -20902,6 +20971,9 @@ msgstr "Přistávací dráha (runway)"
 msgid "Taxiway"
 msgstr "Pojížděcí dráha (taxiway)"
 
+msgid "Holding Position"
+msgstr "Vyčkávací místo"
+
 msgid "Helipad"
 msgstr "Helipad (přistávací plocha pro vrtulníky)"
 
@@ -21572,11 +21644,11 @@ msgstr "Číslo místa"
 msgid "Point Name"
 msgstr "Jméno místa"
 
-msgid "Phone Number"
-msgstr "Telefonní číslo"
+msgid "Emergency Phone Number"
+msgstr "Nouzové telefonní číslo"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
+msgid "(Use number as shown on plate.)"
+msgstr "(Použijte číslo tak, jak je zapsané na ceduli)"
 
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -21590,6 +21662,12 @@ msgstr "Stanice záchranky"
 msgid "Automated Defibrillator"
 msgstr "Automatický defibrilátor"
 
+msgid "Location description"
+msgstr "Popis umístění"
+
+msgid "Phone Number"
+msgstr "Telefonní číslo"
+
 msgid "Located inside a building?"
 msgstr "Umístěný v budově?"
 
@@ -22459,6 +22537,10 @@ msgid "university"
 msgstr "univerzita"
 
 msgctxt "building"
+msgid "college"
+msgstr "vysoká škola"
+
+msgctxt "building"
 msgid "hospital"
 msgstr "nemocnice"
 
@@ -22543,6 +22625,10 @@ msgid "public"
 msgstr "veřejná"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "zřícenina"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Patra"
 
@@ -24755,8 +24841,14 @@ msgstr "Přírodní rezervace"
 msgid "Scree"
 msgstr "Suťoviště"
 
-msgid "An accumulation of loose rocks."
-msgstr "Volná hromada kamení."
+msgid "An accumulation of loose angular rocks."
+msgstr "Nahromadění volných hranatých kamenů."
+
+msgid "Shingle"
+msgstr "Oblázkový štěrk"
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr "Nahromadění volných oblázků na pláži či říčním korytě."
 
 msgid "Fell"
 msgstr "Travnatá horská krajina (fell)"
@@ -25435,17 +25527,11 @@ msgstr "Trasy"
 msgid "Bicycle Route"
 msgstr "Cyklotrasa"
 
-msgid "icn"
-msgstr "icn (mezinárodní)"
-
-msgid "ncn"
-msgstr "ncn (národní, KČT 1.-3. třída)"
+msgid "national"
+msgstr "národní"
 
-msgid "rcn"
-msgstr "rcn (regionální, KČT 4. třída)"
-
-msgid "lcn"
-msgstr "lcn (lokální)"
+msgid "local"
+msgstr "místní"
 
 msgid "Mountain Biking Route"
 msgstr "Trasa pro horská kola"
@@ -25453,18 +25539,6 @@ msgstr "Trasa pro horská kola"
 msgid "Hiking Route"
 msgstr "Turistická trasa"
 
-msgid "iwn"
-msgstr "iwn (evropská, Enn)"
-
-msgid "nwn"
-msgstr "nwn (národní, dálková)"
-
-msgid "rwn"
-msgstr "rwn (regionální)"
-
-msgid "lwn"
-msgstr "lwn (místní)"
-
 msgid "infrastructure"
 msgstr "vybavení"
 
@@ -25477,18 +25551,6 @@ msgstr "Trasa pěší turistiky"
 msgid "Riding Route"
 msgstr "Trasa pro jezdce na koni"
 
-msgid "ihn"
-msgstr "ihn"
-
-msgid "nhn"
-msgstr "nhn"
-
-msgid "rhn"
-msgstr "rhn"
-
-msgid "lhn"
-msgstr "lhn"
-
 msgid "Piste Route"
 msgstr "Sjezdovka"
 
@@ -25681,9 +25743,22 @@ msgstr "Liché číslo domu v interpolaci sudých adres."
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr "Cesta s {0}. Označte, je-li to možné, každé číslo domu zvlášť."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+"Objekt  nemá žádnou {0}, ovšem má {1} a {2}, jejichž hodnoty vypadají  jako "
+"číslo domu."
+
+msgid "Same value of {0} and {1}"
+msgstr "Shodná hodnota {0} a {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} bez {1}"
 
+msgid "missing tag"
+msgstr "chybějící značka"
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} bez {1} nebo {2}"
 
@@ -25693,6 +25768,12 @@ msgstr "{0} bez {1}, {2} nebo {3}"
 msgid "{0} together with {1}"
 msgstr "{0} zároveň s {1}"
 
+msgid "suspicious tag combination"
+msgstr "podezřelá kombinace značek"
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr "dva objekty, jeden s {0} a druhý s {1} + {2} + {3}"
+
 msgid "incomplete object: only {0}"
 msgstr "nekompletní objekt: pouze {0}"
 
@@ -25708,39 +25789,24 @@ msgstr "{0} spolu s {1} a konfliktní hodnoty"
 msgid "{0} on suspicious object"
 msgstr "{0} u podezřelého objektu"
 
-msgid "restaurant without name"
-msgstr "restaurace bez názvu (\"name\")"
-
-msgid "{0} used with {1}"
-msgstr "{0} použito s {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "značka \"natural=water\" použitá pro plavecký bazén"
 
 msgid "sport without physical feature"
 msgstr "sport bez reálného objektu"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} by měl být na uzlu, kde se protínají {1} a {2}"
-
 msgid "alternative name without {0}"
 msgstr "alternativní název bez {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "nekompletní použití {0} na cestě bez {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Shodná hodnota {0} a {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Shodná hodnota {0}, {1} a {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} a {1} spolu s {2} a konfliktními hodnotami"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Podezřelá kombinace značek: {0} a {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} na relaci bez {1}"
 
@@ -25765,9 +25831,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} spolu s {1} a {2}. Ostraňte {1} a {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Rozdílný počet jízdních pruhů v klíčích {0} a {1}"
+
+msgid "possibly missing {0} tag"
+msgstr "možná chybějící značka {0}"
+
 msgid "{0} is deprecated"
 msgstr "{0} je zavržen"
 
+msgid "deprecated tagging"
+msgstr "zastaralé značení"
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' nemá žádný význam, použijte nějakou konkrétní značku, např. ''{1}''"
@@ -25835,10 +25910,16 @@ msgstr "Nekonkrétní značka {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Definice {0} je nejasná"
 
+msgid "{0} + {1} + {2}"
+msgstr "{0} + {1} + {2}"
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr "{0} není doporučeno. Použijte funkci otočení cesty z menu nástrojů."
 
+msgid "{0}"
+msgstr "{0}"
+
 msgid "key with uncommon character"
 msgstr "klíč s neobvyklým znakem"
 
@@ -25854,8 +25935,8 @@ msgstr "{0} je zastaralá pro {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} je zastaralé. Použijte místo toho  prefix klíče {1}: ."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "pochybný klíč (končící číslem): {0}"
+msgid "questionable key (ending with a number)"
+msgstr "pochybný klíč (končící číslem)"
 
 msgid "The key {0} has an uncommon value."
 msgstr "Klíč {0} má neobvyklou hodnotu."
@@ -25899,8 +25980,8 @@ msgstr "Překrývající se stejné přírodní plochy"
 msgid "Overlapping Identical Landuses"
 msgstr "Překrývající se stejné využití oblasti (landuse)"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} musí být připojen k cestě"
+msgid "isolated node which must be connected to a way"
+msgstr "izolované uzly, které musí být připojeny k cestě"
 
 msgid "node connects waterway and bridge"
 msgstr "uzel spojuje vodní cestu a most"
@@ -25937,6 +26018,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Linie pobřeží uvnitř {1}"
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} by měl být na uzlu, kde se protínají {1} a {2}"
+
 msgid "abbreviated street name"
 msgstr "zkrácený název ulice"
 
@@ -25955,6 +26039,9 @@ msgstr "cesta bez označení ''ref''"
 msgid "temporary highway type"
 msgstr "dočasný typ cesty"
 
+msgid "{0} used with {1}"
+msgstr "{0} použito s {1}"
+
 msgid "street name contains ss"
 msgstr "název ulice obsahuje ss"
 
@@ -26055,11 +26142,14 @@ msgstr "neznámá varianta judaismu"
 msgid "{0} is unnecessary"
 msgstr "{0} není potřeba uvádět"
 
+msgid "unnecessary tag"
+msgstr "zbytečná značka"
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} není potřebná pro {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} nedává smysl"
+msgid "{0} makes no sense"
+msgstr "{0} nedává smysl"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Uzly duplikující značky cesty, jejíž jsou součástí"
@@ -26317,6 +26407,27 @@ msgstr "Nahrávám GPX trasu na server"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Nahraje trasy na openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Probíhá import…"
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr "Soubory DXF [doplněk ImportDxf] (*.dxf)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Před importem, prosím, otevřete nebo vytvořte datovou vrstvu"
+
+msgid "Import dxf"
+msgstr "Import dxf"
+
+msgid "Scale:"
+msgstr "Měřítko:"
+
+msgid "unit(s) = "
+msgstr "jednotka = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Zobrazit výškový profil"
 
@@ -26673,6 +26784,409 @@ 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 "Total images:"
+msgstr "Celkem obrázků:"
+
+msgid "images"
+msgstr "obrázků"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "Písmo dopravní značky na ''{0}'' má špatný formát"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Nemohu načíst soubor písma z ''{0}''"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Vytvořit vrstvu Mapillary"
+
+msgid "Start Mapillary layer"
+msgstr "Spustit vrstvu 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 "Select pictures"
+msgstr "Výběr obrázků"
+
+msgid "Import pictures into sequence"
+msgstr "Importovat obrázky do sekvence"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importovat obrázky do vrstvy Mapillary v sekvenci"
+
+msgid "Join mode"
+msgstr "Režim slučování"
+
+msgid "Join/unjoin pictures"
+msgstr "Sloučit/rozdělit obrázky"
+
+msgid "Join Mapillary pictures"
+msgstr "Sloučit obrázky Mapillary"
+
+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 "Upload pictures"
+msgstr "Nahrát obrázky na server"
+
+msgid "Upload Mapillary pictures"
+msgstr "Nahrát obrázky Mapillary na server"
+
+msgid "Upload pictures."
+msgstr "Nahrát obrázky na server."
+
+msgid "Walk mode"
+msgstr "Režim chůze"
+
+msgid "Start walk mode"
+msgstr "Spustit 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 "View in website"
+msgstr "Zobrazit na webové stránce"
+
+msgid "Copy key"
+msgstr "Kopírovat klíč"
+
+msgid "Copy key tag"
+msgstr "Kopírovat hodnotu klíče"
+
+msgid "Edit on website"
+msgstr "Upravit na webu"
+
+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 "Submit"
+msgstr "Odeslat"
+
+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 folder"
+msgstr "Zvolte složku"
+
+msgid "Explore"
+msgstr "Prozkoumat"
+
+msgid "Select a directory"
+msgstr "Zvolte adresář"
+
+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 "Mapillary picture"
+msgstr "Obrázek Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Otevřít okno Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Dialog Mapillary"
+
+msgid "Open Mapillary main dialog"
+msgstr "Otevřít hlavní dialog 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 "Login"
+msgstr "Přihlásit se"
+
+msgid "Logout"
+msgstr "Odhlásit se"
+
+msgid "Download mode"
+msgstr "Režim stahování"
+
+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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+"Stažená plocha OSM je příliš velká. Režim stahování byl změněn na plochu OSM "
+"do doby, než bude vrstva restartována."
+
+msgid "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 "The image key ''{0}'' is invalid!"
+msgstr "Klíč obrázku ''{0}'' je neplatný!"
+
+msgid "The image key must not be null here!"
+msgstr "Klíč obrázku zde nesmí být prázdný!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "Sekvenční klíč ''{0}'' je neplatný!"
+
+msgid "The sequence key must not be null here!"
+msgstr "Sekvenční klíč zde nesmí být prázdný!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28526,9 +29040,6 @@ 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"
 
@@ -28562,9 +29073,6 @@ 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"
 
@@ -29148,9 +29656,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29343,21 +29848,9 @@ msgstr "Importované obrázky"
 msgid "Import vector graphics"
 msgstr "Import vektorové kresby"
 
-msgid "Scale:"
-msgstr "Měřítko:"
-
-msgid "unit(s) = "
-msgstr "jednotka = "
-
-msgid "Importing..."
-msgstr "Probíhá import…"
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVG soubory [doplněk ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Před importem, prosím, otevřete nebo vytvořte datovou vrstvu"
-
 msgid "Concourse wizard ..."
 msgstr "Pomocník pro chodby..."
 
@@ -29575,6 +30068,65 @@ msgstr "Počet nalezených {0}-cestných křižovatek: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "vytvořit všechny kombinace možných vjezdů/výjezdů"
 
+msgid "Check the direction"
+msgstr "Zkontrolovat směr"
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+"Kontroluje směr zvoleného potoku/řeky. Je správně?\n"
+" Průběh: "
+
+msgid "Correct"
+msgstr "Správně"
+
+msgid "Wrong"
+msgstr "Špatně"
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr "<HTML><U>S</U>právný směr</HTML>"
+
+msgid "Direction of river is correct."
+msgstr "Směr řeky je správný."
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr "<HTML><U>Š</U>patná směr</HTML>"
+
+msgid "Direction of river is wrong."
+msgstr "Směr řeky je špatný."
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr "<HTML><U>I</U>gnorovat tuto cestu</HTML>"
+
+msgid "Ignore direction of this way."
+msgstr "Ignorovat směr této cesty."
+
+msgid "Check direction of streams"
+msgstr "Kontrolovat směr toků"
+
+msgid "Check direction of streams and rivers"
+msgstr "Kontrolovat směr potoků a řek"
+
+msgid "No more directions to check!"
+msgstr "Již není nic ke zkontrolování!"
+
+msgid "Replace way"
+msgstr "Nahradit cestu"
+
+msgid "Replace way of selected way with a new way"
+msgstr "Nahradit vybranou cestu novou cestou"
+
+msgid "Replace Geometry"
+msgstr "Nahradit geometrii"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+"Tento nástroj nahrazuje cestu pobřeží jinou cestou, takže vyžaduje aby byly "
+"vybrány přesně dvě cesty pobřeží."
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Index směru ''{0}'' nenalezen."
 
@@ -29835,406 +30387,6 @@ msgstr "Aktivuje doplněk hlášení chyb MapDust"
 msgid "Missing input data"
 msgstr "Chybějící vstupní data"
 
-msgid "Mapillary Images"
-msgstr "Obrázky Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Vrstva Mapillary"
-
-msgid "Total images:"
-msgstr "Celkem obrázků:"
-
-msgid "images"
-msgstr "obrázků"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr "Písmo dopravní značky na ''{0}'' má špatný formát"
-
-msgid "Could not read font-file from ''{0}''"
-msgstr "Nemohu načíst soubor písma z ''{0}''"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Vytvořit vrstvu Mapillary"
-
-msgid "Start Mapillary layer"
-msgstr "Spustit vrstvu 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 "Select pictures"
-msgstr "Výběr obrázků"
-
-msgid "Import pictures into sequence"
-msgstr "Importovat obrázky do sekvence"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importovat obrázky do vrstvy Mapillary v sekvenci"
-
-msgid "Join mode"
-msgstr "Režim slučování"
-
-msgid "Join/unjoin pictures"
-msgstr "Sloučit/rozdělit obrázky"
-
-msgid "Join Mapillary pictures"
-msgstr "Sloučit obrázky Mapillary"
-
-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 "Upload pictures"
-msgstr "Nahrát obrázky na server"
-
-msgid "Upload Mapillary pictures"
-msgstr "Nahrát obrázky Mapillary na server"
-
-msgid "Upload pictures."
-msgstr "Nahrát obrázky na server."
-
-msgid "Walk mode"
-msgstr "Režim chůze"
-
-msgid "Start walk mode"
-msgstr "Spustit 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 "Uploaded {0} images"
-msgstr "Nahráno {0} obrázků"
-
-msgid "Approve upload on the website"
-msgstr "Potvrdit nahrání na web"
-
-msgid "View in website"
-msgstr "Zobrazit na webové stránce"
-
-msgid "Copy key"
-msgstr "Kopírovat klíč"
-
-msgid "Copy key tag"
-msgstr "Kopírovat hodnotu klíče"
-
-msgid "Edit on website"
-msgstr "Upravit na webu"
-
-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 "Submit"
-msgstr "Odeslat"
-
-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 folder"
-msgstr "Zvolte složku"
-
-msgid "Explore"
-msgstr "Prozkoumat"
-
-msgid "Select a directory"
-msgstr "Zvolte adresář"
-
-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 "Mapillary picture"
-msgstr "Obrázek Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Otevřít okno Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Dialog Mapillary"
-
-msgid "Open Mapillary main dialog"
-msgstr "Otevřít hlavní dialog 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 "Download mode"
-msgstr "Režim stahování"
-
-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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"Stahovaná oblast OSM je příliš velká. Režim stahování byl změněn na "
-"poloautomatický do doby, než bude vrstva restartována."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr "Klíč obrázku ''{0}'' je neplatný!"
-
-msgid "The image key must not be null here!"
-msgstr "Klíč obrázku zde nesmí být prázdný!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "Sekvenční klíč ''{0}'' je neplatný!"
-
-msgid "The sequence key must not be null here!"
-msgstr "Sekvenční klíč zde nesmí být prázdný!"
-
 msgid "Measured values"
 msgstr "Naměřené hodnoty"
 
@@ -31782,6 +31934,9 @@ msgstr "VD: Silnice je ve výstavbě"
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr "VD: Trasa probíhá jednosměrkou ve špatném směru"
 
+msgid "moved"
+msgstr "posunuto"
+
 msgid "rail"
 msgstr "kolejnice"
 
@@ -31879,9 +32034,6 @@ msgstr "Zachytit"
 msgid "Join"
 msgstr "Spojit"
 
-msgid "moved"
-msgstr "posunuto"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Hromadná doprava: Propojit GTFS zastávky"
 
@@ -32932,6 +33084,73 @@ msgstr ""
 msgid "Terrace"
 msgstr "Rozdělit na řadové domy"
 
+msgid "Pass over element without marking it"
+msgstr "Přeskočit prvek bez jeho značení"
+
+msgid "Mark element done"
+msgstr "Označit prvek jako hotový"
+
+msgid "Todo list"
+msgstr "Seznam věcí k udělání"
+
+msgid "Open the todo list."
+msgstr "Otevřít seznam věcík udělání."
+
+msgid "Zoom to the selected item in the todo list."
+msgstr "Zvětšit na vybranou položku v seznamu věcí k udělání."
+
+msgid "Select all Unmarked and Zoom"
+msgstr "Zvolit všechny neoznačené a přiblížit"
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+"Zvolit a přiblížit na všechny neoznačené položky v seznamu věcí k udělání."
+
+msgid "Pass"
+msgstr "Průchod"
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+"Přesune se na další položku, ale tuto položku nechá v seznamu věcí k "
+"udělání. ([)."
+
+msgid "Add the selected items to the todo list."
+msgstr "Přidat zvolené položky do seznamu věcí k udělání."
+
+msgid "Mark selected"
+msgstr "Označit vybrané"
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+"Označí vybrané položky (na mapě) jako hotové v seznamu věcí k udělání."
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr "Označí vybrané položky seznamu věcí k udělání jako hotové. (])."
+
+msgid "Mark all"
+msgstr "Označit vše"
+
+msgid "Mark all items in the todo list as done."
+msgstr "Označit všechny položky v seznamu věcí k udělání jako hotové."
+
+msgid "Unmark all"
+msgstr "Odznačit vše"
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+"Odznačit všechny položky v seznamu věcí k udělání, které byly označeny jako "
+"hotové."
+
+msgid "Clear the todo list"
+msgstr "Vymazat seznam věcí k udělání"
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+"Odstranit všechny položky (označené i neoznačené) ze seznamu věcí k udělání."
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr "Seznam věcí k udělání {0}/{1} ({2}%)"
+
 msgid "To-fix"
 msgstr "To-fix"
 
@@ -33406,6 +33625,89 @@ msgstr "Vyberte datum vypršení platnosti pro klíč:"
 msgid "Create a new signing key"
 msgstr "Vytvořit nový podepisovací klíč"
 
+msgid "Turn lanes tagging - editor"
+msgstr "Editor odbočovacích jízdních pruhů"
+
+msgid "Turn lanes tagging - Editor"
+msgstr "Editor odbočovacích jízdních pruhů"
+
+msgid "turn lanes tagging - editor"
+msgstr "editor odbočovacích jízdních pruhů"
+
+msgid "Turn Lanes Editor"
+msgstr "Editor odbočovacích jízdních pruhů"
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr " Počet jízdních pruhů, které byly opraveny podle počtu odbočení"
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+" Počet jízdních pruhů lanes:forward, které byly opraveny podle počtu odbočení"
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+" Počet jízdních pruhů lanes:both_ways, které byly opraveny podle počtu "
+"odbočení"
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+" Počet jízdních pruhů lanes:backward, které byly opraveny podle počtu "
+"odbočení"
+
+msgid "check the right direction of the way"
+msgstr "zkontrolovat správný směr cesty"
+
+msgid "Unidirectional road"
+msgstr "Jednosměrná silnice"
+
+msgid "Build unidirectional road"
+msgstr "Vytvořit jednosměrnou silnici"
+
+msgid "Bidirectional road"
+msgstr "Obousměrná silnice"
+
+msgid "Build bidirectional road"
+msgstr "Obousměrná silnice"
+
+msgid "Use \"none\""
+msgstr "Použít \"none\""
+
+msgid "use \"none\" instead of empty values"
+msgstr "použít \"none\" namísto prázdných hodnot"
+
+msgid "Preset turn lanes"
+msgstr "Předvolba odbočovacích jízdních pruhů"
+
+msgid "Recently turn lanes edits"
+msgstr "Nedávné úpravy odbočovaích jízdních pruhů"
+
+msgid "Forward"
+msgstr "Vpřed"
+
+msgid "Both way lane"
+msgstr "Obousměrný jízdní pruh"
+
+msgid "Backward"
+msgstr "Zpět"
+
+msgid "Number of backward lanes"
+msgstr "Počet pruhů zpět"
+
+msgid "Number of forward lanes"
+msgstr "Počet pruhů vpřed"
+
+msgid "Both way"
+msgstr "Oběma směry"
+
+msgid "Number of lanes"
+msgstr "Počet jízdních pruhů"
+
+msgid "Directional"
+msgstr "Směrově"
+
+msgid "Turn lanes"
+msgstr "Odbočovací jízdní pruhy"
+
 msgid "No such lane."
 msgstr "Takový jízdní pruh není."
 
@@ -34358,9 +34660,6 @@ msgstr "Najít prvky s těmito značkami"
 msgid "Multitag Background: highlight"
 msgstr "Víceznačka pozadí: zvýrazněno"
 
-msgid "Replace Geometry"
-msgstr "Nahradit geometrii"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Nahradí geometrii zvoleného objektu novou"
 
@@ -34570,15 +34869,9 @@ msgstr "spustí/pozastaví přehrávání videa"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "Zpět"
-
 msgid "jumps n sec back"
 msgstr "skočí n sekund zpět"
 
-msgid "Forward"
-msgstr "Vpřed"
-
 msgid "jumps n sec forward"
 msgstr "skočí n sekund dopředu"
 
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index eebfbd4..d5906bb 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:43+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:14+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: cy\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -205,28 +205,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3279,9 +3279,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3683,10 +3680,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3723,6 +3720,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3732,6 +3732,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3768,6 +3771,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3986,6 +3995,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4196,30 +4211,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4463,9 +4478,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4986,9 +4998,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6408,6 +6417,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6647,6 +6659,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7919,9 +7939,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8485,6 +8502,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8536,6 +8556,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8548,6 +8574,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10601,6 +10633,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12682,6 +12717,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13044,6 +13082,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14687,6 +14728,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14798,7 +14842,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14977,6 +15024,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15271,18 +15321,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15292,6 +15330,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15424,6 +15465,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15791,6 +15835,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15905,6 +15952,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16102,6 +16152,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16124,6 +16179,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16280,6 +16338,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17600,6 +17662,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19219,6 +19284,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19889,10 +19957,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19907,6 +19975,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20776,6 +20850,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20860,6 +20938,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23065,7 +23147,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23732,16 +23820,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23750,18 +23832,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23774,18 +23844,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23978,9 +24036,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23990,6 +24059,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24005,39 +24080,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24056,9 +24116,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24113,10 +24182,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24132,7 +24207,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24177,7 +24252,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24211,6 +24286,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24229,6 +24307,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24319,10 +24400,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24568,6 +24652,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24906,3267 +25011,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29628,6 +29770,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29723,9 +29868,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30737,6 +30879,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31184,6 +31386,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32010,9 +32290,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32206,15 +32483,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 5532b40..402eb0f 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-09-04 14:59+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-01 15:20+0000\n"
 "Last-Translator: Jørn <joern.map at gmail.com>\n"
 "Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:46+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:40+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: da_DK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -214,18 +214,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Tilføj billedlag {0}"
 
-msgid "Error"
-msgstr "Fejl"
-
-msgid "Select image format for WMS layer"
-msgstr "Vælg billedformat for WMS laget"
-
-msgid "Select WMS layers"
-msgstr "Vælg WMS lag"
-
-msgid "Add layers"
-msgstr "Tilføj lag"
-
 msgid "Invalid service URL."
 msgstr "Ugyldig service URL"
 
@@ -238,6 +226,18 @@ msgstr "Kunne ikke hente WMS laglisten."
 msgid "Could not parse WMS layer list."
 msgstr "Kunne ikke fortolke WMS laglisten."
 
+msgid "Error"
+msgstr "Fejl"
+
+msgid "Select image format for WMS layer"
+msgstr "Vælg billedformat for WMS laget"
+
+msgid "Select WMS layers"
+msgstr "Vælg WMS lag"
+
+msgid "Add layers"
+msgstr "Tilføj lag"
+
 msgid "Add Node..."
 msgstr "Tilføj punkt..."
 
@@ -3540,9 +3540,6 @@ msgstr "Matrix sæt identifikator"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Ingen lag defineret af getCapabilities dokument: {0}"
 
-msgid "No layer selected"
-msgstr "Intet lag valgt"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3976,12 +3973,12 @@ msgstr "Flere associatedStreet relationer"
 msgid "House number without street"
 msgstr "Husnummer uden gade"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Husnummer \"{0}\" duplikeret"
-
 msgid "Duplicate house numbers"
 msgstr "Duplikerede husnumre"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Husnummer \"{0}\" duplikeret"
+
 msgid "Multiple street names in relation"
 msgstr "Adskillige gadenavne i relationen"
 
@@ -4017,6 +4014,9 @@ msgstr "Kystlinjer"
 msgid "This test checks that coastlines are correct."
 msgstr "Denne test tjekker om kystlinjer er korrekte."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Omvendt kystlinje: Der er ikke land på venstre side"
+
 msgid "Unconnected coastline"
 msgstr "Uforbunden kystlinje"
 
@@ -4026,6 +4026,9 @@ msgstr "Uordnet kystlinje"
 msgid "Reversed coastline"
 msgstr "Omvendt kystlinje"
 
+msgid "invalid coastline"
+msgstr "ugyldig kystlinje"
+
 msgid "Conditional Keys"
 msgstr "Betingede nøgler"
 
@@ -4062,6 +4065,12 @@ msgstr "Krydsende grænser"
 msgid "Crossing barriers"
 msgstr "Krydsende barrierer"
 
+msgid "Self crossing"
+msgstr "Selvkrydsende"
+
+msgid "Self-crossing ways"
+msgstr "Selvkrydsende veje"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4194,10 +4203,10 @@ msgid "Number of lane dependent values inconsistent"
 msgstr "Antal lane afhængige værdier inkonsekvente"
 
 msgid "Number of lane dependent values inconsistent in forward direction"
-msgstr "Antal lane afhængige værdier inkonsekvent i fremadgående retning"
+msgstr "Antal af bane afhængige værdier inkonsekvent i fremad retning"
 
 msgid "Number of lane dependent values inconsistent in backward direction"
-msgstr "Antal lane afhængige værdier inkonsekvent i baglæns retning"
+msgstr "Antal af bane afhængige værdier inkonsekvent i bagud retning"
 
 msgid "Long segments"
 msgstr "Lange segmenter"
@@ -4294,6 +4303,12 @@ msgstr "Ingen brugbar rolle for multipolygon medlem"
 msgid "Non-Way in multipolygon"
 msgstr "Ikke-vej i multipolygon"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr "Multipolygon medlem(mer) gentaget med anden rolle"
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr "Multipolygon medlem(mer) gentaget med samme rolle"
+
 msgid "Missing name:* translation"
 msgstr "Manglende navn:* oversættelse"
 
@@ -4518,30 +4533,30 @@ msgstr "Egenskabsværdi indeholder flere mellemrum"
 msgid "Property values contain HTML entity"
 msgstr "Egenskabsværdi indeholder HTML-kodet tegn"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Nøgle ''{0}'' ligner ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Forkert stavet egenskabsnøgle"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Nøglen \"{0}\" er ikke i prædefinerede"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Nøgle ''{0}'' ligner ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Prædefinitionerne indeholder ikke egenskabs-nøglen"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Værdi ''{0}'' for nøgle ''{1}'' ligner ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Nøglen \"{0}\" er ikke i prædefinerede"
 
 msgid "Misspelled property value"
 msgstr "Forkert stavet egenskabsværdi"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Værdien \"{0}\" for nøglen \"{1}\" er ikke i prædefinerede"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Værdi ''{0}'' for nøgle ''{1}'' ligner ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Prædefinitionerne indeholder ikke egenskabsværdi"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Værdien \"{0}\" for nøglen \"{1}\" er ikke i prædefinerede"
+
 msgid "FIXMES"
 msgstr "FIXMEs"
 
@@ -4791,9 +4806,6 @@ msgstr "Forkert ordnede veje"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Denne test tjekker retningen af vand-, land- og kystlinje-veje."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Omvendt kystlinje: Der er ikke land på venstre side"
-
 msgid "Reversed land: land not on left side"
 msgstr "Omvendt land: Der er ikke land på venstre side"
 
@@ -5342,9 +5354,6 @@ msgstr "Den geografiske længdegrad ved musemarkøren."
 msgid "System of measurement changed to {0}"
 msgstr "Målesystem ændret til {0}"
 
-msgid "Layer not in list."
-msgstr "Lag er ikke i listen"
-
 msgid "Default (open, closed, new)"
 msgstr "Standard (åben, lukket, ny)"
 
@@ -6304,14 +6313,14 @@ msgstr "Løser alle uløste konflikter til ''deres'' version"
 
 msgid "There was {0} conflict detected."
 msgid_plural "There were {0} conflicts detected."
-msgstr[0] "Der blev opdaget {0} konflikt"
-msgstr[1] "Der blev opdaget {0} konflikter"
+msgstr[0] "Der blev fundet {0} konflikt"
+msgstr[1] "Der blev fundet {0} konflikter"
 
 msgid "Click to close this dialog and continue editing"
 msgstr "Klik for at lukke denne dialog og fortsætte med at redigere"
 
 msgid "Conflicts detected"
-msgstr "Konflikter opdaget"
+msgstr "Konflikter fundet"
 
 msgid "Resolve conflicts"
 msgstr "Løs konflikter"
@@ -6887,6 +6896,9 @@ msgstr "Sorter noter"
 msgid "Sort"
 msgstr "Sorter"
 
+msgid "Open the note in an external browser"
+msgstr "Åbn note i en ekstern browser"
+
 msgid "Object type:"
 msgstr "Objekttype:"
 
@@ -7132,6 +7144,15 @@ msgstr "Download indhold af rettesæt"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Download indholdet af de markerede rettesæt fra serveren"
 
+msgid "Download changed objects"
+msgstr "Download ændrede objekter"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+"Download den aktuelle version af de ændrede objekter i det valgte rettesæt"
+
 msgid "My changesets"
 msgstr "Mine rettesæt"
 
@@ -7801,7 +7822,7 @@ msgstr[0] "Dette vil ændre {0} objekt."
 msgstr[1] "Dette vil ændre op til {0} objekter."
 
 msgid "An empty value deletes the tag."
-msgstr "En tom værdi sletter taggen."
+msgstr "En tom værdi sletter tagget."
 
 msgid "You changed the key from ''{0}'' to ''{1}''."
 msgstr "Du ændrede nøglen fra ''{0}'' til ''{1}''."
@@ -8131,7 +8152,7 @@ msgstr ""
 "<html>Relationen er ændret.<br><br>Ønsker du at gemme dine ændringer?</html>"
 
 msgid "Unsaved changes"
-msgstr "Ej-gemte ændringer"
+msgstr "Ugemte ændringer"
 
 msgid "Delete the currently edited relation"
 msgstr "Slet den redigerede relation"
@@ -8508,9 +8529,6 @@ msgstr "Indtast et stednavn at søge efter"
 msgid "Areas around places"
 msgstr "Områder omkring steder"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer-fejl, sikkert på grund af nogle manglende tags."
-
 msgid "Search ..."
 msgstr "Søg ..."
 
@@ -9140,6 +9158,9 @@ msgstr "Ugemte ændringer - Gem/Upload før afslutning?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Ugemte ændringer - Gem/Upload før sletning?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "Ugemte ændringer - Gem/Upload før genstart?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Uploader og gemmer ændrede lag ..."
 
@@ -9205,6 +9226,12 @@ msgstr "Afslut nu!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Afslut JOSM uden at gemme. Ugemte ændringer går tabt."
 
+msgid "Restart now!"
+msgstr "Genstart nu!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr "Genstart JOSM uden at gemme. Ugemte ændringer går tabt."
+
 msgid "Delete now!"
 msgstr "Slet nu!"
 
@@ -9217,6 +9244,12 @@ msgstr "Udfør handlinger før afslutning"
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr "Afslut JOSM og gem. Ugemte ændringer uploades og/eller gemmes."
 
+msgid "Perform actions before restarting"
+msgstr "Udfør handlinger før genstart"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr "Genstart JOSM og gem. Ugemte ændringer uploades og/eller gemmes."
+
 msgid "Perform actions before deleting"
 msgstr "Udfør handlinger før sletning"
 
@@ -11503,6 +11536,9 @@ msgstr "Tegn ensrettet pile."
 msgid "Draw segment order numbers"
 msgstr "Tegn numre for segment-rækkefølgen"
 
+msgid "Draw segment order numbers on selected way"
+msgstr "Tegn segment ordensnumrene på valgt vej"
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn grænserne for downloadet data"
 
@@ -13758,6 +13794,9 @@ msgstr "NMEA import succes:"
 msgid "NMEA import failure!"
 msgstr "NMEA import fejl!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Null pointer-fejl, sikkert på grund af nogle manglende tags."
+
 msgid "Note Files"
 msgstr "Notefiler"
 
@@ -14146,6 +14185,9 @@ msgstr "Uploader data ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Uventet id 0 fundet for osm primitiv"
 
+msgid "Failed to evaluate {0}"
+msgstr "Kunne ikke evaluere {0}"
+
 msgid "Downloading data..."
 msgstr "Downloader data..."
 
@@ -15121,11 +15163,11 @@ msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
 "(untranslated):<br>{0}</html>"
 msgstr ""
-"<html>Serveren meddelte at der er opdaget en konflikt.<br>Fejlbesked (u-"
+"<html>Serveren meddelte at der er fundet en konflikt.<br>Fejlbesked (u-"
 "oversat):<br>{0}</html>"
 
 msgid "<html>The server reported that it has detected a conflict."
-msgstr "<html>Serveren meddelte at den har opdaget en konflikt."
+msgstr "<html>Serveren meddelte at den har fundet en konflikt."
 
 msgid ""
 "<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
@@ -15242,7 +15284,7 @@ msgid "Download redirected to ''{0}''"
 msgstr "Download omdirigeret til \"{0}\""
 
 msgid "Too many redirects to the download URL detected. Aborting."
-msgstr "Opdagede for mange omdirigeringer til download URL’en. Afbryder."
+msgstr "Fandt for mange omdirigeringer til download URL’en. Afbryder."
 
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
@@ -16047,6 +16089,9 @@ msgstr "Tiris: DGM (Terrain model)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Surface model)"
 
+msgid "Tiris: contour lines"
+msgstr "Tiris: contour lines"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -16158,8 +16203,11 @@ msgstr "Geodatastyrelsen matrikelkort INSPIRE visning"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr "SDFE Overflade Skyggekort (40 cm)"
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen skærmkort"
@@ -16339,6 +16387,9 @@ msgstr "Drone Imagery 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drone Imagery Canaan(Haiti) November 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr "Drone Imagery Matthew(Haiti) October 2016"
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortophoto 2000"
 
@@ -16633,18 +16684,6 @@ msgstr "Freemap.sk Cyclo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Ski"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakia Historic Maps"
 
@@ -16654,6 +16693,9 @@ msgstr "RABA-KGZ: Slovenia farmland use"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slovenia built-up areas"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "City of Cape Town 2015 Aerial"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
@@ -16786,6 +16828,9 @@ msgstr "U.S. Forest Service roads"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Ukraine - Kyiv 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -17186,6 +17231,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Downloader OSM data langs en vej"
 
+msgid "Dxf Import"
+msgstr "Dxf import"
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17334,6 +17382,9 @@ msgstr ""
 "Opretter en kanal digraf og tjekker en delmængde af kanaler hvis det er et "
 "vejkryds eller søger i en delmængde af kanaler i vejkryds"
 
+msgid "Tools to help import Kartverket N50"
+msgstr "Værktøj der hjælper med import af Kartverket N50"
+
 msgid "Helps vectorizing WMS images."
 msgstr "Hjælper med at vektorisere WMS-billeder."
 
@@ -17585,6 +17636,13 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Lav rækkehuse ud af en enkelt blok."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+"Tilføjer en huskeliste dialogboks, der gør det nemt at gå gennem store "
+"lister med objekter"
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17614,6 +17672,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Udvidelse til at signere OSM-data digitalt"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr "Editor der tilføjer svingbane tags til veje"
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17781,6 +17842,10 @@ msgid "No wheeled vehicle"
 msgstr "Intet køretøj med hjul"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr "ridebane"
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "bane"
 
@@ -19093,7 +19158,7 @@ msgstr "fremad"
 
 msgctxt "overtaking"
 msgid "backward"
-msgstr "tilbage"
+msgstr "bagud"
 
 msgctxt "overtaking"
 msgid "no"
@@ -19109,6 +19174,9 @@ msgstr "under udførelse"
 msgid "Ford"
 msgstr "Vadested"
 
+msgid "stepping_stones"
+msgstr "trædesten"
+
 msgid "Ways"
 msgstr "Stier"
 
@@ -19362,7 +19430,7 @@ msgid "forward"
 msgstr "fremad"
 
 msgid "backward"
-msgstr "tilbage"
+msgstr "bagud"
 
 msgid "reversible"
 msgstr "vendbar"
@@ -20694,19 +20762,19 @@ msgid "Public transport route (Legacy)"
 msgstr "Offentlig transportrute (gammel)"
 
 msgid "forward segment"
-msgstr "fremadsegment"
+msgstr "segment fremad"
 
 msgid "backward segment"
-msgstr "tilbagesegment"
+msgstr "segment bagud"
 
 msgid "halt point"
 msgstr "stoppested"
 
 msgid "forward halt point"
-msgstr "forlæns stoppested"
+msgstr "stoppested fremad"
 
 msgid "backward halt point"
-msgstr "baglæns stoppested"
+msgstr "stoppested bagud"
 
 msgid "UIC-Reference"
 msgstr "UIC-reference"
@@ -20747,6 +20815,9 @@ msgstr "Startbane"
 msgid "Taxiway"
 msgstr "Taxibane"
 
+msgid "Holding Position"
+msgstr "Stop position"
+
 msgid "Helipad"
 msgstr "Helikopterlandingsplads"
 
@@ -21419,11 +21490,11 @@ msgstr "Punktnummer"
 msgid "Point Name"
 msgstr "Punktnavn"
 
-msgid "Phone Number"
-msgstr "Telefonnummer"
+msgid "Emergency Phone Number"
+msgstr "Alarmerings telefonnummer"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Brug landekode, ligesom +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr "(Brug nummer vist på plade.)"
 
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -21437,6 +21508,12 @@ msgstr "Ambulancestation"
 msgid "Automated Defibrillator"
 msgstr "Hjertestarter"
 
+msgid "Location description"
+msgstr "Sted beskrivelse"
+
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
 msgid "Located inside a building?"
 msgstr "Placeret inde i en bygning?"
 
@@ -22306,6 +22383,10 @@ msgid "university"
 msgstr "universitet"
 
 msgctxt "building"
+msgid "college"
+msgstr "videregående udd."
+
+msgctxt "building"
 msgid "hospital"
 msgstr "hospital"
 
@@ -22390,6 +22471,10 @@ msgid "public"
 msgstr "offentlig"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "ruiner"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Etager"
 
@@ -24602,8 +24687,14 @@ msgstr "Naturreservat"
 msgid "Scree"
 msgstr "Ur"
 
-msgid "An accumulation of loose rocks."
-msgstr "En ophobning af løse sten."
+msgid "An accumulation of loose angular rocks."
+msgstr "En ophobning af løse kantede sten."
+
+msgid "Shingle"
+msgstr "Småsten"
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr "En ophobning af løse afrundede sten på en strand eller et flodleje."
 
 msgid "Fell"
 msgstr "Fjeldområde"
@@ -25285,17 +25376,11 @@ msgstr "Ruter"
 msgid "Bicycle Route"
 msgstr "Cykelrute"
 
-msgid "icn"
-msgstr "international cykel netværk"
-
-msgid "ncn"
-msgstr "national cykel netværk"
+msgid "national"
+msgstr "national"
 
-msgid "rcn"
-msgstr "regional cykel netværk"
-
-msgid "lcn"
-msgstr "lokal cykel netværk"
+msgid "local"
+msgstr "lokal"
 
 msgid "Mountain Biking Route"
 msgstr "Mountainbikerute"
@@ -25303,18 +25388,6 @@ msgstr "Mountainbikerute"
 msgid "Hiking Route"
 msgstr "Vandrerute"
 
-msgid "iwn"
-msgstr "international vandre netværk"
-
-msgid "nwn"
-msgstr "national vandre netværk"
-
-msgid "rwn"
-msgstr "regional vandre netværk"
-
-msgid "lwn"
-msgstr "lokal vandre netværk"
-
 msgid "infrastructure"
 msgstr "infrastruktur"
 
@@ -25327,18 +25400,6 @@ msgstr "Gårute"
 msgid "Riding Route"
 msgstr "Riderute"
 
-msgid "ihn"
-msgstr "international ride netværk"
-
-msgid "nhn"
-msgstr "national ride netværk"
-
-msgid "rhn"
-msgstr "regional ride netværk"
-
-msgid "lhn"
-msgstr "lokal ride netværk"
-
 msgid "Piste Route"
 msgstr "Pisterute"
 
@@ -25531,9 +25592,21 @@ msgstr "Ulige husnummer i selv adresse interpolation."
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr "Vej med {0}. Tag hver husnummer separat, hvis det er muligt."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+"Objekt har ingen {0}, men det har {1} og {2} hvis værdi ligner et husnummer."
+
+msgid "Same value of {0} and {1}"
+msgstr "Samme værdi som {0} og {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} uden {1}"
 
+msgid "missing tag"
+msgstr "mangler tag"
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} uden {1} eller {2}"
 
@@ -25543,6 +25616,12 @@ msgstr "{0} uden {1}, {2} eller {3}"
 msgid "{0} together with {1}"
 msgstr "{0} sammen med {1}"
 
+msgid "suspicious tag combination"
+msgstr "mistænkelig tag kombination"
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr "to objekter, et med {0} og et med {1} + {2} + {3}"
+
 msgid "incomplete object: only {0}"
 msgstr "ufuldstændigt objekt: kun {0}"
 
@@ -25558,39 +25637,24 @@ msgstr "{0} sammen med {1} og modstridende værdier"
 msgid "{0} on suspicious object"
 msgstr "{0} på mistænkeligt objekt"
 
-msgid "restaurant without name"
-msgstr "restaurant uden navn"
-
-msgid "{0} used with {1}"
-msgstr "{0} bruges med {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "natural water brugt til swimming pool"
 
 msgid "sport without physical feature"
 msgstr "sport uden fysisk funktion"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} bør være på punktet hvor {1} og {2} krydser"
-
 msgid "alternative name without {0}"
 msgstr "alternativt navn uden {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "mangelfuld brug af {0} på vej uden {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Samme værdi som {0} og {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Samme værdi som {0}, {1} og {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} og {1} sammen med {2} og modstridende værdier"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Mistænkelig tag kombination: {0} og {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} på en relation uden {1}"
 
@@ -25615,9 +25679,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} sammen med {1} og {2}. Fjern {1} og {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Forskellige antal baner i nøglerne {0} og {1}"
+
+msgid "possibly missing {0} tag"
+msgstr "mangler måske {0} tag"
+
 msgid "{0} is deprecated"
 msgstr "{0} er forældet"
 
+msgid "deprecated tagging"
+msgstr "forældede tags"
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr "''{0}'' er meningsløst, brug mere specifikke tags, f.eks. ''{1}''"
 
@@ -25681,12 +25754,18 @@ msgstr "Uspecifik tag {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Definition af {0} er uklar"
 
+msgid "{0} + {1} + {2}"
+msgstr "{0} + {1} + {2}"
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} kan ikke anbefales. Brug vend vejretninger funktionen fra menuen "
 "værktøjer."
 
+msgid "{0}"
+msgstr "{0}"
+
 msgid "key with uncommon character"
 msgstr "nøgle med ualmindelig karakter"
 
@@ -25702,8 +25781,8 @@ msgstr "{0} er forældet for {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} er forældet. Brug {1}: nøgle præfikset i stedet."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "tvivlsom nøgle (slutter med et tal): {0}"
+msgid "questionable key (ending with a number)"
+msgstr "tvivlsom nøgle (slutter med et tal)"
 
 msgid "The key {0} has an uncommon value."
 msgstr "Nøglen {0} har en usædvanlig værdi."
@@ -25747,8 +25826,8 @@ msgstr "Overlappende identiske naturområder"
 msgid "Overlapping Identical Landuses"
 msgstr "Overlappende identiske landområder"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} skal være forbundet til en vej"
+msgid "isolated node which must be connected to a way"
+msgstr "isoleret punkt som skal være forbundet til en vej"
 
 msgid "node connects waterway and bridge"
 msgstr "node forbinder vandløb og bro"
@@ -25785,6 +25864,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Kystlinje inden i {1}"
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} bør være på punktet hvor {1} og {2} krydser"
+
 msgid "abbreviated street name"
 msgstr "forkortet gadenavn"
 
@@ -25803,6 +25885,9 @@ msgstr "vej uden en reference"
 msgid "temporary highway type"
 msgstr "midlertidig vejtype"
 
+msgid "{0} used with {1}"
+msgstr "{0} bruges med {1}"
+
 msgid "street name contains ss"
 msgstr "gadenavn indeholder ss"
 
@@ -25901,11 +25986,14 @@ msgstr "ukendt jødisk trosretning"
 msgid "{0} is unnecessary"
 msgstr "{0} er unødvendig"
 
+msgid "unnecessary tag"
+msgstr "unødvendigt tag"
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} er unødvendig for {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} giver ingen mening"
+msgid "{0} makes no sense"
+msgstr "{0} giver ingen mening"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Punkter der duplikerer \"forældre\"-vej tags"
@@ -26162,6 +26250,27 @@ msgstr "Uploader GPX-spor"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Uploader GPX-spor til openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importerer..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr "DXF filer [ImportDxf udvidelse] (*.dxf)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Åbn eller skab datalag før importering"
+
+msgid "Import dxf"
+msgstr "Importer dxf"
+
+msgid "Scale:"
+msgstr "Skala:"
+
+msgid "unit(s) = "
+msgstr "enhed(er) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Viser højdeprofil"
 
@@ -26517,6 +26626,406 @@ 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 "Total images:"
+msgstr "Total antal billeder:"
+
+msgid "images"
+msgstr "billeder"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "Trafik skilt font fra ''{0}'' har forkert format"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Kunne ikke læse font-fil fra ''{0}''"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Opret Mapillary lag"
+
+msgid "Start Mapillary layer"
+msgstr "Start Mapillary lag"
+
+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 "Select pictures"
+msgstr "Vælg billeder"
+
+msgid "Import pictures into sequence"
+msgstr "Importer billeder i rækkefølge"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importer billeder til Mapillary lag i en rækkefølge"
+
+msgid "Join mode"
+msgstr "Sammenlæg tilstand"
+
+msgid "Join/unjoin pictures"
+msgstr "Sammenlæg/adskil billeder"
+
+msgid "Join Mapillary pictures"
+msgstr "Sammenlæg Mapillary 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 "Upload pictures"
+msgstr "Upload billeder"
+
+msgid "Upload Mapillary pictures"
+msgstr "Upload Mapillary billeder"
+
+msgid "Upload pictures."
+msgstr "Upload billeder."
+
+msgid "Walk mode"
+msgstr "Gå tilstand"
+
+msgid "Start walk mode"
+msgstr "Start 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 "View in website"
+msgstr "Se på hjemmesiden"
+
+msgid "Copy key"
+msgstr "Kopier nøgle"
+
+msgid "Copy key tag"
+msgstr "Kopier nøgle tag"
+
+msgid "Edit on website"
+msgstr "Rediger på hjemmesiden"
+
+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 "Submit"
+msgstr "Indsend"
+
+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 folder"
+msgstr "Vælg en mappe"
+
+msgid "Explore"
+msgstr "Filstyringsprogram"
+
+msgid "Select a directory"
+msgstr "Vælg en mappe"
+
+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 "Mapillary picture"
+msgstr "Mapillary billede"
+
+msgid "Open Mapillary window"
+msgstr "Åbn Mapillary vindue"
+
+msgid "Mapillary dialog"
+msgstr "Mapillary dialog"
+
+msgid "Open Mapillary main dialog"
+msgstr "Åbn Mapillary hoveddialog"
+
+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 "Login"
+msgstr "Log ind"
+
+msgid "Logout"
+msgstr "Log ud"
+
+msgid "Download mode"
+msgstr "Download tilstand"
+
+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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+"Det downloadede OSM-område er for stort. Download tilstand er blevet ændret "
+"til OSM område indtil laget genstartes."
+
+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 "The image key ''{0}'' is invalid!"
+msgstr "Nøglen ''{0}'' til billedet er ugyldig!"
+
+msgid "The image key must not be null here!"
+msgstr "Nøglen til billedet må ikke være null her!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "Nøglen ''{0}'' til rækkefølgen  er ugyldig!"
+
+msgid "The sequence key must not be null here!"
+msgstr "Nøglen til rækkefølgen må ikke være null her!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28370,9 +28879,6 @@ 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"
 
@@ -28405,9 +28911,6 @@ msgstr "Privat samtale"
 msgid "Close tab"
 msgstr "Luk fane"
 
-msgid "Logout"
-msgstr "Log ud"
-
 msgid "Clear log"
 msgstr "Ryd log"
 
@@ -28980,9 +29483,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29172,21 +29672,9 @@ msgstr "Importerede billeder"
 msgid "Import vector graphics"
 msgstr "Importer vektor grafik"
 
-msgid "Scale:"
-msgstr "Skala:"
-
-msgid "unit(s) = "
-msgstr "enhed(er) = "
-
-msgid "Importing..."
-msgstr "Importerer..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVG filer [ImportVec plugin] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Åbn eller skab datalag før importering"
-
 msgid "Concourse wizard ..."
 msgstr "Guide til forhal ..."
 
@@ -29403,6 +29891,65 @@ msgstr "Antal {0}-veje vejkryds fundet: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "generere alle kombinationer fra indgangs/udgangs kandidater"
 
+msgid "Check the direction"
+msgstr "Tjek retningen"
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+"Tjek retningen af det valgte vandløb/flod. Er det korrekt?\n"
+" Fremdrift: "
+
+msgid "Correct"
+msgstr "Korrekt"
+
+msgid "Wrong"
+msgstr "Forkert"
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr "<HTML><U>K</U>orrekt retning</HTML>"
+
+msgid "Direction of river is correct."
+msgstr "Retning af flod er korrekt."
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr "<HTML><U>F</U>orkert retning</HTML>"
+
+msgid "Direction of river is wrong."
+msgstr "Retning af flod er forkert."
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr "<HTML><U>I</U>gnorer denne vej</HTML>"
+
+msgid "Ignore direction of this way."
+msgstr "Ignorer retning af denne vej."
+
+msgid "Check direction of streams"
+msgstr "Tjek retningen af vandløb"
+
+msgid "Check direction of streams and rivers"
+msgstr "Tjek retningen af vandløb og floder"
+
+msgid "No more directions to check!"
+msgstr "Ikke flere retninger for at tjekke!"
+
+msgid "Replace way"
+msgstr "Erstat vej"
+
+msgid "Replace way of selected way with a new way"
+msgstr "Erstat den valgte vej med en ny vej"
+
+msgid "Replace Geometry"
+msgstr "Erstat geometri"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+"Dette værktøj erstatter en kystlinje vej med en anden, og kræver derfor "
+"præcis to kystlinjer veje for at blive valgt."
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Retnings indeks ''{0}'' blev ikke fundet"
 
@@ -29653,403 +30200,6 @@ msgstr "Aktiverer MapDust fejlrapporter udvidelse"
 msgid "Missing input data"
 msgstr "Mangler inputdata"
 
-msgid "Mapillary Images"
-msgstr "Mapillary billeder"
-
-msgid "Mapillary layer"
-msgstr "Mapillary lag"
-
-msgid "Total images:"
-msgstr "Total antal billeder:"
-
-msgid "images"
-msgstr "billeder"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr "Trafik skilt font fra ''{0}'' har forkert format"
-
-msgid "Could not read font-file from ''{0}''"
-msgstr "Kunne ikke læse font-fil fra ''{0}''"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Opret Mapillary lag"
-
-msgid "Start Mapillary layer"
-msgstr "Start Mapillary lag"
-
-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 "Select pictures"
-msgstr "Vælg billeder"
-
-msgid "Import pictures into sequence"
-msgstr "Importer billeder i rækkefølge"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importer billeder til Mapillary lag i en rækkefølge"
-
-msgid "Join mode"
-msgstr "Sammenlæg tilstand"
-
-msgid "Join/unjoin pictures"
-msgstr "Sammenlæg/adskil billeder"
-
-msgid "Join Mapillary pictures"
-msgstr "Sammenlæg Mapillary 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 "Upload pictures"
-msgstr "Upload billeder"
-
-msgid "Upload Mapillary pictures"
-msgstr "Upload Mapillary billeder"
-
-msgid "Upload pictures."
-msgstr "Upload billeder."
-
-msgid "Walk mode"
-msgstr "Gå tilstand"
-
-msgid "Start walk mode"
-msgstr "Start 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 "Uploaded {0} images"
-msgstr "Uploadede {0} billeder"
-
-msgid "Approve upload on the website"
-msgstr "Godkend upload på hjemmesiden"
-
-msgid "View in website"
-msgstr "Se på hjemmesiden"
-
-msgid "Copy key"
-msgstr "Kopier nøgle"
-
-msgid "Copy key tag"
-msgstr "Kopier nøgle tag"
-
-msgid "Edit on website"
-msgstr "Rediger på hjemmesiden"
-
-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 "Submit"
-msgstr "Indsend"
-
-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 folder"
-msgstr "Vælg en mappe"
-
-msgid "Explore"
-msgstr "Filstyringsprogram"
-
-msgid "Select a directory"
-msgstr "Vælg en mappe"
-
-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 "Mapillary picture"
-msgstr "Mapillary billede"
-
-msgid "Open Mapillary window"
-msgstr "Åbn Mapillary vindue"
-
-msgid "Mapillary dialog"
-msgstr "Mapillary dialog"
-
-msgid "Open Mapillary main dialog"
-msgstr "Åbn Mapillary hoveddialog"
-
-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 "Download mode"
-msgstr "Download tilstand"
-
-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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"Det downloadede OSM-området er for stort. Download tilstand er blevet ændret "
-"til halvautomatisk indtil laget genstartes."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr "Nøglen ''{0}'' til billedet er ugyldig!"
-
-msgid "The image key must not be null here!"
-msgstr "Nøglen til billedet må ikke være null her!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "Nøglen ''{0}'' til rækkefølgen  er ugyldig!"
-
-msgid "The sequence key must not be null here!"
-msgstr "Nøglen til rækkefølgen må ikke være null her!"
-
 msgid "Measured values"
 msgstr "Målte værdier"
 
@@ -30246,7 +30396,7 @@ msgstr "Krypter data med Windows logonoplysninger"
 
 msgid "The native password manager plugin detected {0} on your system."
 msgstr ""
-"Den oprindelig adgangskode håndterings udvidelse opdagede {0} på dit system."
+"Den oprindelig adgangskode håndterings udvidelse fandt {0} på dit system."
 
 msgid "Days without mapping: {0}."
 msgstr "Dage uden kortlægning: {0}."
@@ -31587,6 +31737,9 @@ msgstr "OT: Vej er under udførelse"
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr "OT: Rute passerer en ensrettet vej i den forkerte retning"
 
+msgid "moved"
+msgstr "flyttet"
+
 msgid "rail"
 msgstr "strømskinne"
 
@@ -31684,9 +31837,6 @@ msgstr "Opfang"
 msgid "Join"
 msgstr "Sammenlæg"
 
-msgid "moved"
-msgstr "flyttet"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Offentlig transport: Sammenlæg GTFS stop"
 
@@ -32739,6 +32889,67 @@ msgstr ""
 msgid "Terrace"
 msgstr "Rækkehus"
 
+msgid "Pass over element without marking it"
+msgstr "Spring over element uden at mærke det"
+
+msgid "Mark element done"
+msgstr "Mærk element som færdig"
+
+msgid "Todo list"
+msgstr "Huskeliste"
+
+msgid "Open the todo list."
+msgstr "Åbn huskelisten."
+
+msgid "Zoom to the selected item in the todo list."
+msgstr "Zoom til det valgte emne i huskelisten."
+
+msgid "Select all Unmarked and Zoom"
+msgstr "Vælg alle uden markering og zoom"
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr "Vælg og zoom til alle emner uden markering i huskelisten."
+
+msgid "Pass"
+msgstr "Pas"
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr "Flyt til næste emne men behold dette emne i huskelisten. ([)."
+
+msgid "Add the selected items to the todo list."
+msgstr "Tilføj det valgte emne til huskelisten."
+
+msgid "Mark selected"
+msgstr "Mærk det valgte"
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr "Mærk det valgte emne (på kortet) som færdig i huskelisten."
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr "Mærk det valgte emne i huskelisten som færdig. (])."
+
+msgid "Mark all"
+msgstr "Mærk alle"
+
+msgid "Mark all items in the todo list as done."
+msgstr "Mærk alle emner i huskelisten som færdige."
+
+msgid "Unmark all"
+msgstr "Fjern alle"
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+"Fjern mærker for alle emner i huskelisten der er blevet mærket som færdige."
+
+msgid "Clear the todo list"
+msgstr "Ryd huskelisten"
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr "Fjern alle emner (med markering og uden markering) fra huskelisten."
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr "Huskeliste {0}/{1} ({2}%)"
+
 msgid "To-fix"
 msgstr "Skal-rettes"
 
@@ -33213,15 +33424,93 @@ msgstr "Vælg en udløbsdato for nøglen:"
 msgid "Create a new signing key"
 msgstr "Opret en ny underskrivelse nøgle"
 
+msgid "Turn lanes tagging - editor"
+msgstr "Svingbaner tags - editor"
+
+msgid "Turn lanes tagging - Editor"
+msgstr "Svingbaner tags - editor"
+
+msgid "turn lanes tagging - editor"
+msgstr "svingbaner tags - editor"
+
+msgid "Turn Lanes Editor"
+msgstr "Svingbaner tags editor"
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr " Antallet af baner er rettet i henhold til antal sving"
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr " Antallet af baner fremad er rettet i henhold til antal sving"
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr " Antallet af baner begge veje er rettet i henhold til antal sving"
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr " Antallet af baner bagud er rettet i henhold til antal sving"
+
+msgid "check the right direction of the way"
+msgstr "tjek den rigtige retning af vejen"
+
+msgid "Unidirectional road"
+msgstr "Ensrettet vej"
+
+msgid "Build unidirectional road"
+msgstr "Lav ensrettet vej"
+
+msgid "Bidirectional road"
+msgstr "Dobbeltrettet vej"
+
+msgid "Build bidirectional road"
+msgstr "Lav dobbeltrettet vej"
+
+msgid "Use \"none\""
+msgstr "Brug \"none\""
+
+msgid "use \"none\" instead of empty values"
+msgstr "brug \"none\" i stedet for tomme værdier"
+
+msgid "Preset turn lanes"
+msgstr "Prædefinerede svingbaner"
+
+msgid "Recently turn lanes edits"
+msgstr "De seneste svingbaner redigeringer"
+
+msgid "Forward"
+msgstr "Fremad"
+
+msgid "Both way lane"
+msgstr "Begge veje bane"
+
+msgid "Backward"
+msgstr "Bagud"
+
+msgid "Number of backward lanes"
+msgstr "Antal baner bagud"
+
+msgid "Number of forward lanes"
+msgstr "Antal baner fremad"
+
+msgid "Both way"
+msgstr "Begge veje"
+
+msgid "Number of lanes"
+msgstr "Antal baner"
+
+msgid "Directional"
+msgstr "Retning"
+
+msgid "Turn lanes"
+msgstr "Svingbaner"
+
 msgid "No such lane."
-msgstr "Sådan et spor findes ikke."
+msgstr "Sådan en bane findes ikke."
 
 msgid ""
 "<html>The number of lanes is not specified for one or more roads; please add "
 "missing lanes tags.</html>"
 msgstr ""
-"<html>Antallet af spor er ikke angivet for en eller flere veje; tilføj "
-"manglende spor tags.</html>"
+"<html>Antallet af baner er ikke angivet for en eller flere veje; tilføj "
+"manglende bane tags.</html>"
 
 msgid ""
 "<html>An error occurred while constructing the model. Please run the "
@@ -34153,9 +34442,6 @@ msgstr "Find primitiver med disse tags"
 msgid "Multitag Background: highlight"
 msgstr "Multitag baggrund: fremhæv"
 
-msgid "Replace Geometry"
-msgstr "Erstat geometri"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Erstat geometri på markeret objekt med en ny"
 
@@ -34362,15 +34648,9 @@ msgstr "starter/pauser video afspilning"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "Tilbage"
-
 msgid "jumps n sec back"
 msgstr "hopper n sek tilbage"
 
-msgid "Forward"
-msgstr "Fremad"
-
 msgid "jumps n sec forward"
 msgstr "hopper n sek fremad"
 
diff --git a/i18n/po/de.po b/i18n/po/de.po
index a46f2bb..78cbda3 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-09-02 21:55+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-02 19:57+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore at googlemail.com>\n"
 "Language-Team: JOSM\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:54+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:45+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: de\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -219,18 +219,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Hintergrundbildebene {0} hinzufügen"
 
-msgid "Error"
-msgstr "Fehler"
-
-msgid "Select image format for WMS layer"
-msgstr "Bildformat der WMS-Ebene wählen"
-
-msgid "Select WMS layers"
-msgstr "WMS-Ebenen auswählen"
-
-msgid "Add layers"
-msgstr "Ebenen hinzufügen"
-
 msgid "Invalid service URL."
 msgstr "Ungültige Dienstadresse."
 
@@ -243,6 +231,18 @@ msgstr "Konnte die Liste der WMS-Ebenen nicht abfragen."
 msgid "Could not parse WMS layer list."
 msgstr "Konnte die Liste der WMS-Ebenen nicht einlesen."
 
+msgid "Error"
+msgstr "Fehler"
+
+msgid "Select image format for WMS layer"
+msgstr "Bildformat der WMS-Ebene wählen"
+
+msgid "Select WMS layers"
+msgstr "WMS-Ebenen auswählen"
+
+msgid "Add layers"
+msgstr "Ebenen hinzufügen"
+
 msgid "Add Node..."
 msgstr "Punkt hinzufügen …"
 
@@ -3641,9 +3641,6 @@ msgstr "Matrixsatzbezeichner"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Im getCapabilities-Dokument sind keine Ebenen bestimmt: {0}"
 
-msgid "No layer selected"
-msgstr "Keine Ebene ausgewählt"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4096,12 +4093,12 @@ msgstr "Mehrere associatedStreet-Relationen"
 msgid "House number without street"
 msgstr "Hausnummer ohne Straße"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Hausnummer »{0}« verdoppelt"
-
 msgid "Duplicate house numbers"
 msgstr "Hausnummern verdoppeln"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Hausnummer »{0}« verdoppelt"
+
 msgid "Multiple street names in relation"
 msgstr "Mehrere Straßennamen in Relation"
 
@@ -4139,6 +4136,9 @@ msgstr "Küstenlinien"
 msgid "This test checks that coastlines are correct."
 msgstr "Dieser Test überprüft, ob die Küsten korrekt sind."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Verdrehte Küstenlinie: Land nicht auf der linken Seite"
+
 msgid "Unconnected coastline"
 msgstr "Nicht verbundene Küstenlinie"
 
@@ -4148,6 +4148,9 @@ msgstr "Ungeordnete Küsten"
 msgid "Reversed coastline"
 msgstr "Die Richtung einer Küstenlinie ist falsch"
 
+msgid "invalid coastline"
+msgstr "ungültige Küstenlinie"
+
 msgid "Conditional Keys"
 msgstr "Bedingte Schlüssel"
 
@@ -4184,6 +4187,12 @@ msgstr "Überschneidende Grenzen"
 msgid "Crossing barriers"
 msgstr "Überschneidende Barrieren"
 
+msgid "Self crossing"
+msgstr "Selbstüberquerung"
+
+msgid "Self-crossing ways"
+msgstr "Selbstüberquerende Wege"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4316,7 +4325,7 @@ msgid "Number of lane dependent values inconsistent"
 msgstr "Anzahl der spurabhängigen Werte inkonsistent"
 
 msgid "Number of lane dependent values inconsistent in forward direction"
-msgstr "Anzahl der spurabhängigen Werte in Forwärtsrichtung inkonsistent"
+msgstr "Anzahl der spurabhängigen Werte in Vorwärtsrichtung inkonsistent"
 
 msgid "Number of lane dependent values inconsistent in backward direction"
 msgstr "Anzahl der spurabhängigen Werte in Rückwärtsrichtung inkonsistent"
@@ -4420,6 +4429,12 @@ msgstr "Keine sinnvolle Rolle für Multipolygon-Element"
 msgid "Non-Way in multipolygon"
 msgstr "Nicht-Linie im Multipolygon"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr "Wiederholtes Multipolygon-Element mit unterschiedlicher Rolle"
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr "Wiederholtes Multipolygon-Element mit gleicher Rolle"
+
 msgid "Missing name:* translation"
 msgstr "Fehlender übersetzter Name (Merkmal name:*)"
 
@@ -4648,30 +4663,30 @@ msgstr "Eigenschaftswerte enthalten mehrere Leerräume"
 msgid "Property values contain HTML entity"
 msgstr "Werte enthalten HTML-Entität"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Schlüssel ''{0}'' ähnelt ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Falsch geschriebener Eigenschaftsschlüssel"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Schlüssel \"{0}\" nicht in Vorlagen."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Schlüssel ''{0}'' ähnelt ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Vorlagen enthalten Schlüssel nicht"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Wert ''{0}'' für Schlüssel ''{1}'' sieht aus wie ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Schlüssel \"{0}\" nicht in Vorlagen."
 
 msgid "Misspelled property value"
 msgstr "Falsch geschriebener Wert"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Wert \"{0}\" für Schlüssel \"{1}\" nicht in Vorlagen."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Wert ''{0}'' für Schlüssel ''{1}'' sieht aus wie ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Vorlagen enthalten Wert nicht"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Wert \"{0}\" für Schlüssel \"{1}\" nicht in Vorlagen."
+
 msgid "FIXMES"
 msgstr "Korrekturnotizen"
 
@@ -4928,9 +4943,6 @@ msgstr "Falsch geordnete Linien"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Dieser Test überprüft die Richtung von Wasser, Land und Küsten."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Verdrehte Küstenlinie: Land nicht auf der linken Seite"
-
 msgid "Reversed land: land not on left side"
 msgstr "Verdrehtes Land: Land nicht auf der linken Seite"
 
@@ -5488,9 +5500,6 @@ msgstr "Die geographische Länge an der Mausposition."
 msgid "System of measurement changed to {0}"
 msgstr "Einheitendarstellung geändert in {0}"
 
-msgid "Layer not in list."
-msgstr "Ebene nicht in der Liste."
-
 msgid "Default (open, closed, new)"
 msgstr "Standard (offen, geschlossen, neu)"
 
@@ -7053,6 +7062,9 @@ msgstr "Hinweise sortieren"
 msgid "Sort"
 msgstr "Sortieren"
 
+msgid "Open the note in an external browser"
+msgstr "Den Hinweis in einem externen Browser öffnen"
+
 msgid "Object type:"
 msgstr "Objekttyp:"
 
@@ -7311,6 +7323,16 @@ msgstr "Änderungssatzinhalt herunterladen"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Inhalt der ausgewählten Änderungssätze vom Server herunterladen"
 
+msgid "Download changed objects"
+msgstr "Geänderte Objekte herunterladen"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+"Aktuelle Version der geänderten Objekte im ausgewählten Änderungssatz "
+"herunterladen"
+
 msgid "My changesets"
 msgstr "Eigene Änderungssätze"
 
@@ -8731,9 +8753,6 @@ msgstr "Bitte den Ortsnamen eingeben, nach dem gesucht werden soll."
 msgid "Areas around places"
 msgstr "Ladebereich um bestimmte Orte"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Nullzeiger-Ausnahme, vielleicht fehlende Merkmale."
-
 msgid "Search ..."
 msgstr "Suchen …"
 
@@ -9395,6 +9414,9 @@ msgstr "Ungespeicherte Änderungen - Vor dem Beenden speichern/hochladen?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Ungespeicherte Änderungen - Vor dem Löschen speichern/hochladen?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "Ungespeicherte Änderungen - Vor dem Neustart speichern/hochladen?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Veränderte Ebenen werden hochgeladen und gespeichert …"
 
@@ -9463,6 +9485,13 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "JOSM ohne Speichern verlassen. Ungespeicherte Änderungen gehen verloren."
 
+msgid "Restart now!"
+msgstr "Jetzt neu starten!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+"JOSM ohne Speichern neu starten. Ungespeicherte Änderungen gehen verloren."
+
 msgid "Delete now!"
 msgstr "Löschen!"
 
@@ -9478,6 +9507,14 @@ msgstr ""
 "JOSM mit Speichern verlassen. Ungespeicherte Änderungen werden hochgeladen "
 "und/oder gespeichert."
 
+msgid "Perform actions before restarting"
+msgstr "Aktionen vor dem Neustart ausführen"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+"JOSM mit Speichern neu starten. Ungespeicherte Änderungen werden hochgeladen "
+"und/oder gespeichert."
+
 msgid "Perform actions before deleting"
 msgstr "Aktionen vor dem Löschen ausführen"
 
@@ -11823,6 +11860,9 @@ msgstr "Einbahnstraßenpfeile zeichnen."
 msgid "Draw segment order numbers"
 msgstr "Ordnungsnummer des Abschnitts anzeigen"
 
+msgid "Draw segment order numbers on selected way"
+msgstr "Abschnitt-Sortierungsnummern auf ausgewählten Weg zeichnen"
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Begrenzung der heruntergeladenen Daten zeichnen"
 
@@ -14174,6 +14214,9 @@ msgstr "NMEA-Einlesen erfolgreich:"
 msgid "NMEA import failure!"
 msgstr "NMEA-Einlesen fehlgeschlagen!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Nullzeiger-Ausnahme, vielleicht fehlende Merkmale."
+
 msgid "Note Files"
 msgstr "OSM-Hinweisdateien"
 
@@ -14588,6 +14631,9 @@ msgstr "Daten werden hochgeladen …"
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Unerwartete Kennung 0 für OSM-Primitive gefunden"
 
+msgid "Failed to evaluate {0}"
+msgstr "Fehler beim Auswerten von {0}"
+
 msgid "Downloading data..."
 msgstr "Daten werden heruntergeladen…"
 
@@ -16548,6 +16594,9 @@ msgstr "Tiris: DGM (Geländemodell)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Oberflächenmodell)"
 
+msgid "Tiris: contour lines"
+msgstr "Tiris: Höhenlinien"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Wien: Mehrzweckkarte"
 
@@ -16659,8 +16708,11 @@ msgstr "Geodatenbehörde Flurstücke INSPIRE-Ansicht"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatenbehörde DTK-Karte25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatenbehörde Schummerungskarte 1,6 m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr "SDFE Gelände Schattenkarte (40 cm)"
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr "SDFE Oberfläche Schattenkarte (40 cm)"
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatenbehörde Bildschirmkarte"
@@ -16840,6 +16892,9 @@ msgstr "Dronenbilder 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drohnenbild Canaan (Haiti) November 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr "Drohnenbilder Matthew (Haiti) Oktober 2016"
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI Orthofoto 2000"
 
@@ -17000,13 +17055,13 @@ msgid "Geoportal 2: ISOK hillshade"
 msgstr "Geoportal 2: ISOK-Schummerung"
 
 msgid "Będzin: Ortofotomapa 2013 (aerial image)"
-msgstr "Będzin: Luftbild 2013"
+msgstr "Bendzin: Luftbild 2013"
 
 msgid "Będzin: Budynki (buildings)"
 msgstr "Będzin: Gebäude"
 
 msgid "Bytom: Ortofotomapa 2012 (aerial image)"
-msgstr "Bytom: Luftbild 2012"
+msgstr "Beuthen: Luftbild 2012"
 
 msgid "Bytom: Fotoplan 2014 (aerial image)"
 msgstr "Beuthen: Fotoplan 2014 (Luftbild)"
@@ -17021,7 +17076,7 @@ msgid "Częstochowa: Budynki (buildings)"
 msgstr "Tschenstochau: Gebäude (buildings)"
 
 msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
-msgstr "Częstochowa: Luftbild 2011"
+msgstr "Tschenstochau: Luftbild 2011"
 
 msgid "Częstochowa: Ortofotomapa 2013 (aerial image)"
 msgstr "Tschenstochau: Luftbild 2013"
@@ -17030,13 +17085,13 @@ msgid "Częstochowa: Ortofotomapa 2014 (aerial image)"
 msgstr "Tschenstochau: Luftbild 2014"
 
 msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
-msgstr "Gliwice: Luftbild 2013"
+msgstr "Gleiwitz: Luftbild 2013"
 
 msgid "Gliwice: Budynki (buildings)"
 msgstr "Gliwice: Gebäude"
 
 msgid "Katowice: Ortofotomapa (aerial image)"
-msgstr "Katowice: Luftbild"
+msgstr "Kattowitz: Luftbild"
 
 msgid "Katowice: Budynki (buildings)"
 msgstr "Kattowitz: Gebäude (buildings)"
@@ -17045,7 +17100,7 @@ msgid "Łódź: Budynki (buildings)"
 msgstr "Łódź: Gebäude"
 
 msgid "Łódź: Ortofotomapa (aerial image)"
-msgstr "Łódź: Luftbild"
+msgstr "Lodz: Luftbild"
 
 msgid "Powiat dębicki: Budynki (buildings)"
 msgstr "Landkreis Dębicki: Gebäude"
@@ -17081,10 +17136,10 @@ msgid "Przemyśl: Budynki (buildings)"
 msgstr "Przemyśl: Gebäude"
 
 msgid "Przemyśl: Ortofotomapa (aerial image)"
-msgstr "Przemyśl: Luftbild"
+msgstr "Premissel: Luftbild"
 
 msgid "Ruda Śląska: Ortofotomapa (aerial image)"
-msgstr "Ruda Śląska: Luftbild"
+msgstr "Ruda: Luftbild"
 
 msgid "Rzeszów: Ortofotomapa (aerial image)"
 msgstr "Rzeszów: Luftbild"
@@ -17093,7 +17148,7 @@ msgid "Rzeszów: Budynki (buildings)"
 msgstr "Rzeszów: Gebäude"
 
 msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
-msgstr "Siemianowice Śląskie: Luftbild"
+msgstr "Siemianowitz: Luftbild"
 
 msgid "Siemianowice Śląskie: Budynki (buildings)"
 msgstr "Siemianowitz: Gebäude (buildings)"
@@ -17102,13 +17157,13 @@ msgid "Świętochłowice: Ortofotomapa 2008 (aerial image)"
 msgstr "Schwientochlowitz: Luftbild 2008"
 
 msgid "Świętochłowice: Ortofotomapa 2009 (aerial image)"
-msgstr "Świętochłowice: Luftbild 2009"
+msgstr "Schwientochlowitz: Luftbild 2009"
 
 msgid "Świętochłowice: Ortofotomapa 2012 (aerial image)"
 msgstr "Schwientochlowitz: Luftbild 2012"
 
 msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgstr "Zabrze: Luftbild 2011"
+msgstr "Hindenburg: Luftbild 2011"
 
 msgid "trail.pl: Szlaki (paths)"
 msgstr "trail.pl: Szlaki (Pfade)"
@@ -17134,18 +17189,6 @@ msgstr "Freemap.sk Fahrrad"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Ski"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slowakei Historische Karten"
 
@@ -17155,6 +17198,9 @@ msgstr "RABA-KGZ: Slowenien - Ackernutzung"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slowenien - bebaute Gebiete"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "Stadt Kapstadt 2015 Luftbilder"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial (Luftbild)"
 
@@ -17287,6 +17333,9 @@ msgstr "U.S. Waldwege"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Ukraine - Kiew 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "7. Serie (OS7)"
 
@@ -17689,6 +17738,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "OSM-Daten entlang einer Linie herunterladen"
 
+msgid "Dxf Import"
+msgstr "DXF-Import"
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17840,6 +17892,11 @@ msgstr ""
 "Kreuzungskritierien überprüfen oder in einer Teilmenge von Kanälen nach "
 "Kreuzungen suchen"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+"Werkzeuge zum Import von \"Kartverket N50\" (N50 Kartendaten der "
+"norwegischen Kartographie- und Katasterbehörde)"
+
 msgid "Helps vectorizing WMS images."
 msgstr "Hilfe beim Vektorisieren von WMS-Bildern."
 
@@ -18098,6 +18155,13 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+"Fügt einen Aufgaben-Dialog hinzu, des es erleichtert große Listen von "
+"Objekten durchzugehen"
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -18129,6 +18193,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Erweiterung zum digitalen Signieren von OSM-Daten"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr "Editor zum Hinzufügen von Abbiegespurmerkmalen an Straßen"
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18300,12 +18367,16 @@ msgid "No wheeled vehicle"
 msgstr "Kein Radfahrzeug"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr "Reitanlage"
+
+msgctxt "riding"
 msgid "pitch"
-msgstr "Reitfeld"
+msgstr "Reitplatz"
 
 msgctxt "riding"
 msgid "sports_centre"
-msgstr "Reithalle"
+msgstr "Sportzentrum"
 
 msgctxt "riding"
 msgid "stadium"
@@ -18313,7 +18384,7 @@ msgstr "Stadion"
 
 msgctxt "riding"
 msgid "track"
-msgstr "Reitbahn"
+msgstr "Rennbahn"
 
 msgid "clay"
 msgstr "Lehm, Asche"
@@ -18710,7 +18781,7 @@ msgstr "Hunderennen"
 
 msgctxt "sport"
 msgid "equestrian"
-msgstr "Reiten"
+msgstr "Pferdesport"
 
 msgctxt "sport"
 msgid "field_hockey"
@@ -19628,6 +19699,9 @@ msgstr "Baustelle"
 msgid "Ford"
 msgstr "Furt"
 
+msgid "stepping_stones"
+msgstr "Trittsteine"
+
 msgid "Ways"
 msgstr "Wege"
 
@@ -19680,14 +19754,14 @@ msgid "SAC Scale"
 msgstr "SAC-Skala"
 
 msgid "T1 - hiking trail"
-msgstr "T1 - Bergweg"
+msgstr "T1 - Wandern"
 
 msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard"
 msgstr ""
 "Weg gut gebahnt. Gelände flach oder leicht geneigt, keine Absturzgefahr"
 
 msgid "T2 - mountain hiking trail"
-msgstr "T2 - anspruchsvoller Bergweg"
+msgstr "T2 - Bergwandern"
 
 msgid ""
 "Trail with continuous line and balanced ascent. Terrain partially steep, "
@@ -19697,7 +19771,7 @@ msgstr ""
 "Absturzgefahr möglich."
 
 msgid "T3 - difficult, exposed hiking trail"
-msgstr "T3 - exponierter, schwieriger Bergweg"
+msgstr "T3 - anspruchsvolles Bergwandern"
 
 msgid ""
 "exposed sites may be secured with ropes or chains, possible need to use "
@@ -19709,7 +19783,7 @@ msgstr ""
 "Schrofen und Geröllflächen möglich."
 
 msgid "T4 - difficult, exposed, steep alpine trail"
-msgstr "T4 - schwieriger alpiner Steig"
+msgstr "T4 - Alpinwandern"
 
 msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
@@ -19720,7 +19794,7 @@ msgstr ""
 "Gletscher und einfache Firnfelder."
 
 msgid "T5 - difficult alpine trail with climbing"
-msgstr "T5 - schwieriger alpiner Steig mit Kletterstellen"
+msgstr "T5 - anspruchsvolles Alpinwandern"
 
 msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
@@ -19731,7 +19805,7 @@ msgstr ""
 "Ausrutschgefahr."
 
 msgid "T6 - hazardous alpine trail with climbing"
-msgstr "T6 - schwieriger, gefährlicher alpiner Steig mit Kletterstellen"
+msgstr "T6 - schwieriges Alpinwandern"
 
 msgid ""
 "climbing up to second grade. Often very exposed, precarious jagged rocks, "
@@ -21275,6 +21349,9 @@ msgstr "Start-/Landebahn"
 msgid "Taxiway"
 msgstr "Rollbahn"
 
+msgid "Holding Position"
+msgstr "Halteposition"
+
 msgid "Helipad"
 msgstr "Hubschrauberlandeplatz"
 
@@ -21602,7 +21679,7 @@ msgid "Sauna"
 msgstr "Sauna"
 
 msgid "Horse Riding"
-msgstr "Pferdereiten"
+msgstr "Reitanlage"
 
 msgid "Playground"
 msgstr "Spielplatz"
@@ -21946,11 +22023,11 @@ msgstr "Punktnummer"
 msgid "Point Name"
 msgstr "Punktname"
 
-msgid "Phone Number"
-msgstr "Telefonnummer"
+msgid "Emergency Phone Number"
+msgstr "Notfalltelefonnummer"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
+msgid "(Use number as shown on plate.)"
+msgstr "(Nummer, wie auf dem Schild dargestellt, verwenden.)"
 
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -21964,6 +22041,12 @@ msgstr "Rettungswache"
 msgid "Automated Defibrillator"
 msgstr "Automatisierter Defibrillator"
 
+msgid "Location description"
+msgstr "Lagebeschreibung"
+
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
 msgid "Located inside a building?"
 msgstr "Im Gebäude befindlich?"
 
@@ -22416,7 +22499,7 @@ msgid "Racetrack"
 msgstr "Rennbahn"
 
 msgid "Golf"
-msgstr "Golfplatz"
+msgstr "Golf"
 
 msgid "Golf Course"
 msgstr "Golfanlage"
@@ -22538,7 +22621,7 @@ msgid "Dog Racing"
 msgstr "Hunderennen"
 
 msgid "Equestrian"
-msgstr "Reitplatz"
+msgstr "Pferdesport"
 
 msgid "Horse Racing"
 msgstr "Pferderennen"
@@ -22833,6 +22916,10 @@ msgid "university"
 msgstr "Universität"
 
 msgctxt "building"
+msgid "college"
+msgstr "Hochschule"
+
+msgctxt "building"
 msgid "hospital"
 msgstr "Krankenhaus"
 
@@ -22917,6 +23004,10 @@ msgid "public"
 msgstr "Öffentliches Gebäude"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "Ruine"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Stockwerke"
 
@@ -25132,10 +25223,18 @@ msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 msgid "Scree"
-msgstr "Geröll"
+msgstr "Hangschutt"
+
+msgid "An accumulation of loose angular rocks."
+msgstr "Eine Ansammlung von kantigen Gesteinsbruchstücken."
 
-msgid "An accumulation of loose rocks."
-msgstr "Eine Ansammlung von losen Steinen."
+msgid "Shingle"
+msgstr "Kies/Geröll"
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
+"Eine Ansammlung von loosen gerundeten Gesteinsbruchstücken an Stränden oder "
+"Flussbetten."
 
 msgid "Fell"
 msgstr "Fjell"
@@ -25817,16 +25916,10 @@ msgstr "Routen"
 msgid "Bicycle Route"
 msgstr "Fahrradroute"
 
-msgid "icn"
-msgstr "international"
-
-msgid "ncn"
+msgid "national"
 msgstr "national"
 
-msgid "rcn"
-msgstr "regional"
-
-msgid "lcn"
+msgid "local"
 msgstr "lokal"
 
 msgid "Mountain Biking Route"
@@ -25835,18 +25928,6 @@ msgstr "Mountainbikeroute"
 msgid "Hiking Route"
 msgstr "Wanderroute"
 
-msgid "iwn"
-msgstr "international"
-
-msgid "nwn"
-msgstr "national"
-
-msgid "rwn"
-msgstr "regional"
-
-msgid "lwn"
-msgstr "lokal"
-
 msgid "infrastructure"
 msgstr "Infrastruktur"
 
@@ -25859,18 +25940,6 @@ msgstr "Wanderweg"
 msgid "Riding Route"
 msgstr "Reitroute"
 
-msgid "ihn"
-msgstr "international"
-
-msgid "nhn"
-msgstr "national"
-
-msgid "rhn"
-msgstr "regional"
-
-msgid "lhn"
-msgstr "lokal"
-
 msgid "Piste Route"
 msgstr "Pistenroute"
 
@@ -26063,9 +26132,22 @@ msgstr "Ungerade Hausnummer in einer geraden Adressinterpolation."
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr "Linie mit {0}. Erfasse wenn möglich jede Hausnummer einzeln."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+"Objekt hat kein {0}. Dafür hat es {1} und {2}, dessen Wert wie eine "
+"Hausnummer aussieht."
+
+msgid "Same value of {0} and {1}"
+msgstr "Gleicher Wert von {0} und {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} ohne {1}"
 
+msgid "missing tag"
+msgstr "fehlendes Merkmal"
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} ohne {1} oder {2}"
 
@@ -26075,6 +26157,12 @@ msgstr "{0} ohne {1}, {2} oder {3}"
 msgid "{0} together with {1}"
 msgstr "{0} zusammen mit {1}"
 
+msgid "suspicious tag combination"
+msgstr "verdächtige Merkmalskombination"
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr "zwei Objekte, eines mit {0} und eines mit {1} + {2} + {3}"
+
 msgid "incomplete object: only {0}"
 msgstr "unvollständiges Objekt: nur {0}"
 
@@ -26090,39 +26178,24 @@ msgstr "{0} zusammen mit {1} und widersprüchlichen Werten"
 msgid "{0} on suspicious object"
 msgstr "{0} auf einem verdächtigen Objekt"
 
-msgid "restaurant without name"
-msgstr "Restaurant ohne Namen"
-
-msgid "{0} used with {1}"
-msgstr "{0} zusammen mit {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "Merkmal natural=water für Schwimmingpool genutzt"
 
 msgid "sport without physical feature"
 msgstr "Sport ohne physisches Merkmal"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} sollte auf einem Punkt liegen, wo sich {1} und {2} schneiden"
-
 msgid "alternative name without {0}"
 msgstr "alternativer Name ohne {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "unvollständige Nutzung von {0} auf einer Linie ohne {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Gleicher Wert von {0} und {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Gleicher Wert von {0}, {1} und {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} und {1} zusammen mit {2} und widersprüchlichen Werten"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Verdächtige Merkmalskombination: {0} und {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} auf einer Relation ohne {1}"
 
@@ -26149,9 +26222,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} zusammen mit {1} und {2}. Entfernen Sie {1} und {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Unterschiedliche Anzahl an Spuren in den Schlüsseln {0} und {1}"
+
+msgid "possibly missing {0} tag"
+msgstr "möglicherweise fehlendes {0}-Merkmal"
+
 msgid "{0} is deprecated"
 msgstr "{0} ist veraltet"
 
+msgid "deprecated tagging"
+msgstr "veraltete Merkmale"
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' ist nichtssagend, ein präziseres Merkmal sollte verwendet werden, "
@@ -26222,12 +26304,18 @@ msgstr "Unbestimmtes Merkmal {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Definition von {0} ist unklar"
 
+msgid "{0} + {1} + {2}"
+msgstr "{0} + {1} + {2}"
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} wird nicht empfohlen. Verwenden Sie die Funktion Linienrichtung umkehren "
 "aus dem Menü Werkzeuge."
 
+msgid "{0}"
+msgstr "{0}"
+
 msgid "key with uncommon character"
 msgstr "Schlüssel mit ungewöhnlichem Zeichen"
 
@@ -26244,8 +26332,8 @@ msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 "{0} ist veraltet. Verwenden Sie stattdessen den Schlüsselpräfix {1}:."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "fragwürdiger Schlüssel (endet mit einer Zahl): {0}"
+msgid "questionable key (ending with a number)"
+msgstr "fragwürdiger Schlüssel (endet mit einer Zahl)"
 
 msgid "The key {0} has an uncommon value."
 msgstr "Der Schlüssel {0} hat einen ungewöhnlichen Wert."
@@ -26289,8 +26377,8 @@ msgstr "Überlappende Naturflächen mit gleichem Typ"
 msgid "Overlapping Identical Landuses"
 msgstr "Überlappende Landnutzungen mit gleichem Typ"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} muss mit einer Linie verbunden sein"
+msgid "isolated node which must be connected to a way"
+msgstr "alleinstehender Punkt, welcher mit einer Linie verbunden sein muss"
 
 msgid "node connects waterway and bridge"
 msgstr "Punkt verbindet Wasserstraße und Brücke"
@@ -26327,6 +26415,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Küstenlinie innerhalb {1}"
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} sollte auf einem Punkt liegen, wo sich {1} und {2} schneiden"
+
 msgid "abbreviated street name"
 msgstr "Abgekürzter Straßenname"
 
@@ -26345,6 +26436,9 @@ msgstr "Straße ohne Referenznummer"
 msgid "temporary highway type"
 msgstr "Temporärer Straßentyp"
 
+msgid "{0} used with {1}"
+msgstr "{0} zusammen mit {1}"
+
 msgid "street name contains ss"
 msgstr "Straßenname enthält ss"
 
@@ -26445,11 +26539,14 @@ msgstr "unbekannte jüdische Konfession"
 msgid "{0} is unnecessary"
 msgstr "{0} ist unnötig"
 
+msgid "unnecessary tag"
+msgstr "unnötiges Merkmal"
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} ist unnötig für {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} ergibt keinen Sinn"
+msgid "{0} makes no sense"
+msgstr "{0} ergibt keinen Sinn"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Punkte verdoppeln Merkmale der Elternlinie"
@@ -26711,6 +26808,27 @@ msgstr "GPX-Spur wird hochgeladen"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "GPS-Spuren zu openstreetmap.org hochladen"
 
+msgid "Importing..."
+msgstr "Importieren …"
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr "DXF-Dateien [ImportDxfPlugin] (*.dxf)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Bitte vor dem Import Datenebene öffnen oder erzeugen"
+
+msgid "Import dxf"
+msgstr "DXF importieren"
+
+msgid "Scale:"
+msgstr "Maßstab:"
+
+msgid "unit(s) = "
+msgstr "Einheit(en) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Höhenprofil anzeigen"
 
@@ -27067,6 +27185,410 @@ 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 "Total images:"
+msgstr "Bilder insgesamt:"
+
+msgid "images"
+msgstr "Bilder"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "Verkehrszeichenschrift bei ''{0}'' hat falsches Format"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Schriftartdatei von ''{0}'' konnte nicht gelesen werden"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Mapillary-Ebene erstellen"
+
+msgid "Start Mapillary layer"
+msgstr "Mapillary-Ebene starten"
+
+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 "Select pictures"
+msgstr "Bilder auswählen"
+
+msgid "Import pictures into sequence"
+msgstr "Bilder als Sequenz importieren"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Bilder als eine Sequenz in die Mapillary-Ebene importieren"
+
+msgid "Join mode"
+msgstr "Verbindungsmodus"
+
+msgid "Join/unjoin pictures"
+msgstr "Bilder verbinden/trennen"
+
+msgid "Join Mapillary pictures"
+msgstr "Mapillary-Bilder verbinden"
+
+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 "Upload pictures"
+msgstr "Bilder hochladen"
+
+msgid "Upload Mapillary pictures"
+msgstr "Mapillary-Bilder hochladen"
+
+msgid "Upload pictures."
+msgstr "Bilder hochladen."
+
+msgid "Walk mode"
+msgstr "Spaziergangmodus"
+
+msgid "Start walk mode"
+msgstr "Spaziergangmodus starten"
+
+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 "View in website"
+msgstr "Auf Internetseite ansehen"
+
+msgid "Copy key"
+msgstr "Mapillary-Schlüssel kopieren"
+
+msgid "Copy key tag"
+msgstr "Mapillary-Tag kopieren"
+
+msgid "Edit on website"
+msgstr "Auf Webseite bearbeiten"
+
+msgid "Current Mapillary changeset"
+msgstr "Aktueller Mapillary-Änderungssatz"
+
+msgid "Open Mapillary changeset dialog"
+msgstr "Mapillary-Änderungssatzdialog öffnen"
+
+msgid "Mapillary changeset"
+msgstr "Mapillary-Änderungssatz"
+
+msgid "Submit"
+msgstr "Absenden"
+
+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 folder"
+msgstr "Wählen Sie einen Ordner aus"
+
+msgid "Explore"
+msgstr "Erkunden"
+
+msgid "Select a directory"
+msgstr "Wählen Sie ein Verzeichnis aus"
+
+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 "Mapillary picture"
+msgstr "Mapillary-Bild"
+
+msgid "Open Mapillary window"
+msgstr "Mapillary Fenster öffnen"
+
+msgid "Mapillary dialog"
+msgstr "Mapillary-Dialog"
+
+msgid "Open Mapillary main dialog"
+msgstr "Mapillary-Hauptdialog ö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 "Login"
+msgstr "Anmelden"
+
+msgid "Logout"
+msgstr "Abmelden"
+
+msgid "Download mode"
+msgstr "Herunterlademodus"
+
+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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+"Der heruntergeladene OSM-Bereich ist zu groß. Herunterlademodus wurde auf "
+"OSM-Bereich geändert, bis die Ebene neu gestartet wird."
+
+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 "The image key ''{0}'' is invalid!"
+msgstr "Der Bild-Schlüssel ''{0}'' ist ungültig!"
+
+msgid "The image key must not be null here!"
+msgstr "Der Bild-Schlüssel darf hier nicht leer sein!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "Der Sequenz-Schlüssel ''{0}'' ist ungültig!"
+
+msgid "The sequence key must not be null here!"
+msgstr "Der Sequenz-Schlüssel darf hier nicht leer sein!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28951,9 +29473,6 @@ 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"
 
@@ -28986,9 +29505,6 @@ msgstr "Privatunterhaltung"
 msgid "Close tab"
 msgstr "Reiter schließen"
 
-msgid "Logout"
-msgstr "Abmelden"
-
 msgid "Clear log"
 msgstr "Protokoll leeren"
 
@@ -29575,9 +30091,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29767,21 +30280,9 @@ msgstr "Importierte Bilder"
 msgid "Import vector graphics"
 msgstr "Vektorgrafiken importieren"
 
-msgid "Scale:"
-msgstr "Maßstab:"
-
-msgid "unit(s) = "
-msgstr "Einheit(en) = "
-
-msgid "Importing..."
-msgstr "Importieren …"
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVG-Dateien [ImportVec-Erweiterung] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Bitte vor dem Import Datenebene öffnen oder erzeugen"
-
 msgid "Concourse wizard ..."
 msgstr "Hallen-Assistent …"
 
@@ -29967,7 +30468,7 @@ msgid "Check "
 msgstr "Überprüfe "
 
 msgid "check the subset for junction properties"
-msgstr ""
+msgstr "überprüfen Sie die Untergruppe für Kreuzungseigenschaften"
 
 msgid "Search "
 msgstr "Suche "
@@ -29998,6 +30499,66 @@ msgstr "Anzahl von gefundenen Kreuzungen mit {0} Linien: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "Erzeuge alle Kombinationen aus Ein- und Ausgängen"
 
+msgid "Check the direction"
+msgstr "Überprüfen Sie die Richtung"
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+"Überprüfen Sie die Richtung des ausgewählten Baches/Flusses. Ist sie "
+"richtig??\n"
+" Fortschritt: "
+
+msgid "Correct"
+msgstr "Korrekt"
+
+msgid "Wrong"
+msgstr "Falsch"
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr "<HTML><U>R</U>ichtige Richtung</HTML>"
+
+msgid "Direction of river is correct."
+msgstr "Richtung des Flusses ist richtig."
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr "<HTML><U>F</U>alsche Richtung</HTML>"
+
+msgid "Direction of river is wrong."
+msgstr "Richtung des Flusses ist falsch."
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr "<HTML><U>D</U>iesen Weg ignorieren</HTML>"
+
+msgid "Ignore direction of this way."
+msgstr "Richtung von diesem Weg ignorieren."
+
+msgid "Check direction of streams"
+msgstr "Richtung von Bachen überprüfen"
+
+msgid "Check direction of streams and rivers"
+msgstr "Richtung von Bachen und Flüssen überprüfen"
+
+msgid "No more directions to check!"
+msgstr "Keine weiteren Richtungen zum Überprüfen!"
+
+msgid "Replace way"
+msgstr "Weg ersetzen"
+
+msgid "Replace way of selected way with a new way"
+msgstr "Weg des ausgewählten Weges mit einem neuen Weg ersetzen"
+
+msgid "Replace Geometry"
+msgstr "Geometrie ersetzen"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+"Dieses Werkzeug ersetzt die Küstenlinie eines Weges mit einer anderen, daher "
+"müssen genau zwei Küstenlinien ausgewählt sein."
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Richtungsindex ''{0}'' nicht gefunden"
 
@@ -30261,407 +30822,6 @@ msgstr "Aktiviert die MapDust-Fehlerreporter-Erweiterung"
 msgid "Missing input data"
 msgstr "Fehlende Eingabedaten"
 
-msgid "Mapillary Images"
-msgstr "Mapillary Bilder"
-
-msgid "Mapillary layer"
-msgstr "Mapillary Ebene"
-
-msgid "Total images:"
-msgstr "Bilder insgesamt:"
-
-msgid "images"
-msgstr "Bilder"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr "Verkehrszeichenschrift bei ''{0}'' hat falsches Format"
-
-msgid "Could not read font-file from ''{0}''"
-msgstr "Schriftartdatei von ''{0}'' konnte nicht gelesen werden"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Mapillary-Ebene erstellen"
-
-msgid "Start Mapillary layer"
-msgstr "Mapillary-Ebene starten"
-
-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 "Select pictures"
-msgstr "Bilder auswählen"
-
-msgid "Import pictures into sequence"
-msgstr "Bilder als Sequenz importieren"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Bilder als eine Sequenz in die Mapillary-Ebene importieren"
-
-msgid "Join mode"
-msgstr "Verbindungsmodus"
-
-msgid "Join/unjoin pictures"
-msgstr "Bilder verbinden/trennen"
-
-msgid "Join Mapillary pictures"
-msgstr "Mapillary-Bilder verbinden"
-
-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 "Upload pictures"
-msgstr "Bilder hochladen"
-
-msgid "Upload Mapillary pictures"
-msgstr "Mapillary-Bilder hochladen"
-
-msgid "Upload pictures."
-msgstr "Bilder hochladen."
-
-msgid "Walk mode"
-msgstr "Spaziergangmodus"
-
-msgid "Start walk mode"
-msgstr "Spaziergangmodus starten"
-
-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 "Uploaded {0} images"
-msgstr "{0} Bilder hochgeladen"
-
-msgid "Approve upload on the website"
-msgstr "Hochladen auf Webseite bestätigen"
-
-msgid "View in website"
-msgstr "Auf Internetseite ansehen"
-
-msgid "Copy key"
-msgstr "Mapillary-Schlüssel kopieren"
-
-msgid "Copy key tag"
-msgstr "Mapillary-Tag kopieren"
-
-msgid "Edit on website"
-msgstr "Auf Webseite bearbeiten"
-
-msgid "Current Mapillary changeset"
-msgstr "Aktueller Mapillary-Änderungssatz"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Mapillary-Änderungssatzdialog öffnen"
-
-msgid "Mapillary changeset"
-msgstr "Mapillary-Änderungssatz"
-
-msgid "Submit"
-msgstr "Absenden"
-
-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 folder"
-msgstr "Wählen Sie einen Ordner aus"
-
-msgid "Explore"
-msgstr "Erkunden"
-
-msgid "Select a directory"
-msgstr "Wählen Sie ein Verzeichnis aus"
-
-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 "Mapillary picture"
-msgstr "Mapillary-Bild"
-
-msgid "Open Mapillary window"
-msgstr "Mapillary Fenster öffnen"
-
-msgid "Mapillary dialog"
-msgstr "Mapillary-Dialog"
-
-msgid "Open Mapillary main dialog"
-msgstr "Mapillary-Hauptdialog ö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 "Download mode"
-msgstr "Herunterlademodus"
-
-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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"Der heruntergeladene OSM-Bereich ist zu groß. Herunterlademodus wurde auf "
-"halbautomatisch geändert, bis die Ebene neu gestartet wird."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr "Der Bild-Schlüssel ''{0}'' ist ungültig!"
-
-msgid "The image key must not be null here!"
-msgstr "Der Bild-Schlüssel darf hier nicht leer sein!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "Der Sequenz-Schlüssel ''{0}'' ist ungültig!"
-
-msgid "The sequence key must not be null here!"
-msgstr "Der Sequenz-Schlüssel darf hier nicht leer sein!"
-
 msgid "Measured values"
 msgstr "Gemessene Werte"
 
@@ -32229,6 +32389,9 @@ msgstr "ÖV: Straße ist im Bau"
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr "ÖV: Route führt in falscher Richtung über eine Einbahnstraße"
 
+msgid "moved"
+msgstr "verschoben"
+
 msgid "rail"
 msgstr "Eisenbahn"
 
@@ -32326,9 +32489,6 @@ msgstr "Erfassen"
 msgid "Join"
 msgstr "Verbinden"
 
-msgid "moved"
-msgstr "verschoben"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Öffentlicher Verkehr: GTFS-Haltestellen verbinden"
 
@@ -33396,6 +33556,76 @@ msgstr ""
 msgid "Terrace"
 msgstr "Abteilen"
 
+msgid "Pass over element without marking it"
+msgstr "Element übergehen ohne es zu markieren"
+
+msgid "Mark element done"
+msgstr "Element als erledigt markieren"
+
+msgid "Todo list"
+msgstr "Abarbeitungsliste"
+
+msgid "Open the todo list."
+msgstr "Aufgabenliste öffnen."
+
+msgid "Zoom to the selected item in the todo list."
+msgstr "Auf den in der Aufgabenliste markierten Eintrag zoomen."
+
+msgid "Select all Unmarked and Zoom"
+msgstr "Alle nicht markierte auswählen und zoomen"
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+"Alle nicht markierten Einträge in der Aufgabenliste auswählen und auf diese "
+"zoomen."
+
+msgid "Pass"
+msgstr "Übergehen"
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+"Zum nächsten Eintrag gehen und diesen Eintrag in der Aufgabenliste belassen. "
+"([)."
+
+msgid "Add the selected items to the todo list."
+msgstr "Ausgewählte Elemente zur Aufgabenliste hinzufügen."
+
+msgid "Mark selected"
+msgstr "Ausgewählte markieren"
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+"Die (auf der Karte) ausgewählten Einträge als erledigt in der Aufgabenliste "
+"markieren."
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+"Ausgewähltes Element in der Aufgabenliste als erledigt markieren. (])."
+
+msgid "Mark all"
+msgstr "Alles markieren"
+
+msgid "Mark all items in the todo list as done."
+msgstr "Alle Elemente in der Aufgabenliste als erledigt markieren."
+
+msgid "Unmark all"
+msgstr "Alles abwählen"
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+"Markierung von allen Einträgen in der Aufgabenliste, die als erledigt "
+"markiert wurden, entfernen."
+
+msgid "Clear the todo list"
+msgstr "Aufgabenliste löschen"
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+"Alle Einträge (markiert und unmarkiert) von der Aufgabenliste entfernen."
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr "Aufgabenliste {0}/{1} ({2}%)"
+
 msgid "To-fix"
 msgstr "To-fix"
 
@@ -33877,6 +34107,92 @@ msgstr "Wählen Sie ein Ablaufdatum für den Schlüssel:"
 msgid "Create a new signing key"
 msgstr "Einen neuen Signaturschlüssel erstellen"
 
+msgid "Turn lanes tagging - editor"
+msgstr "Abbiegespur-Erfassung - Editor"
+
+msgid "Turn lanes tagging - Editor"
+msgstr "Abbiegespur-Erfassung - Editor"
+
+msgid "turn lanes tagging - editor"
+msgstr "Abbiegespur-Erfassung - Editor"
+
+msgid "Turn Lanes Editor"
+msgstr "Abbiegespureditor"
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+" Die Anzahl der Fahrspuren wurde entsprechend der Anzahl der Abbiegewerte "
+"korrigiert"
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+" Die Anzahl der Fahrspuren in Vorwärtsrichtung wurde entsprechend der Anzahl "
+"der Abbiegewerte korrigiert"
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+" Die Anzahl der Fahrspuren in beide Richtungen wurde entsprechend der Anzahl "
+"der Abbiegewerte korrigiert"
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+" Die Anzahl der Fahrspuren in Rückwärtsrichtung wurde entsprechend der "
+"Anzahl der Abbiegewerte korrigiert"
+
+msgid "check the right direction of the way"
+msgstr "Linienrichtung prüfen"
+
+msgid "Unidirectional road"
+msgstr "In eine Richtung verlaufende Straße"
+
+msgid "Build unidirectional road"
+msgstr "In eine Richtung verlaufende Straße erstellen"
+
+msgid "Bidirectional road"
+msgstr "In zwei Richtungen verlaufende Straße"
+
+msgid "Build bidirectional road"
+msgstr "In zwei Richtungen verlaufende Straße erstellen"
+
+msgid "Use \"none\""
+msgstr "Verwende \"none\" (kein/ohne)"
+
+msgid "use \"none\" instead of empty values"
+msgstr "verwende \"none\" (kein/ohne) statt leerer Werte"
+
+msgid "Preset turn lanes"
+msgstr "Voreinstellung Abbiegespuren"
+
+msgid "Recently turn lanes edits"
+msgstr "Kürzliche Abbiegespurbearbeitungen"
+
+msgid "Forward"
+msgstr "Vorwärts"
+
+msgid "Both way lane"
+msgstr "Spur in beide Richtungen"
+
+msgid "Backward"
+msgstr "Rückwärts"
+
+msgid "Number of backward lanes"
+msgstr "Anzahl der Rückwärts-Spuren"
+
+msgid "Number of forward lanes"
+msgstr "Anzahl der Vorwärts-Spuren"
+
+msgid "Both way"
+msgstr "In beide Richtungen"
+
+msgid "Number of lanes"
+msgstr "Anzahl der Spuren"
+
+msgid "Directional"
+msgstr "Gerichtet"
+
+msgid "Turn lanes"
+msgstr "Abbiegespuren"
+
 msgid "No such lane."
 msgstr "Keine solche Spur."
 
@@ -34857,9 +35173,6 @@ msgid "Multitag Background: highlight"
 msgstr ""
 "Hintergrund ''Mehrere Objekte mit Merkmalen versehen'': Hervorgehoben"
 
-msgid "Replace Geometry"
-msgstr "Geometrie ersetzen"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Geometrie des gewählten Objektes durch eine neue ersetzen."
 
@@ -35080,15 +35393,9 @@ msgstr "Videoabspielen starten/anhalten"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "Rückwärts"
-
 msgid "jumps n sec back"
 msgstr "n Sekunden zurückspringen"
 
-msgid "Forward"
-msgstr "Vorwärts"
-
 msgid "jumps n sec forward"
 msgstr "n Sekunden vorwärtsspringen"
 
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 121ed22..0bae744 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:49+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:17+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -209,28 +209,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Lufbild-Ebene {0} hinzufügen"
 
-msgid "Error"
-msgstr "Fehler"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Fehler"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3287,9 +3287,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3691,10 +3688,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3731,6 +3728,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3740,6 +3740,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3776,6 +3779,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3994,6 +4003,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4204,30 +4219,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4471,9 +4486,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4994,9 +5006,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6416,6 +6425,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objekttyp:"
 
@@ -6655,6 +6667,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7927,9 +7947,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8493,6 +8510,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8544,6 +8564,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8556,6 +8582,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10609,6 +10641,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12690,6 +12725,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13052,6 +13090,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14698,6 +14739,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14809,7 +14853,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14988,6 +15035,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15282,18 +15332,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15303,6 +15341,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15435,6 +15476,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15802,6 +15846,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15916,6 +15963,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16113,6 +16163,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16135,6 +16190,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16291,6 +16349,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17611,6 +17673,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19230,6 +19295,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19900,10 +19968,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19918,6 +19986,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20787,6 +20861,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20871,6 +20949,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23076,7 +23158,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23743,16 +23831,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23761,18 +23843,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23785,18 +23855,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23989,9 +24047,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24001,6 +24070,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24016,39 +24091,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24067,9 +24127,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24124,10 +24193,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24143,7 +24218,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24188,7 +24263,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24222,6 +24297,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24240,6 +24318,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24330,10 +24411,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24579,6 +24663,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24917,3271 +25022,3308 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
-msgstr "Land:"
+msgid "Not older than: "
+msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
-msgstr "Ländercode muss aus 2 Buchstaben bestehen"
+msgid "Mapillary dialog"
+msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Street:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Tags:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Name:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Element"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Tag Building"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selection"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Model Settings"
 msgstr ""
 
-msgid "Area Selector"
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Created area"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Error Report"
+msgid "Train a Model"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "edit new tag"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Algorithm"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "open end"
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid "Color Threshold"
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "merge nodes"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Debug"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Odd"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Even"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Numeric"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Actual"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Estimate"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Potential"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Create building"
+msgid "Increment:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Length step:"
+msgid "City:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "State:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
-msgstr ""
+msgid "Country:"
+msgstr "Land:"
 
-msgid "Point on opposite end of the building"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected valid number for increment"
 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] ""
+msgid "Country code must be 2 letters"
+msgstr "Ländercode muss aus 2 Buchstaben bestehen"
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
-"Ort/Stadt {0} nicht gefunden oder nicht verfügbar\n"
-"oder Aktion abgebrochen"
 
-msgid "Choose from..."
+msgid "Length preserved"
 msgstr ""
 
-msgid "Select commune"
+msgid "Angle preserved"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Change the current projection"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "off"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "high"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "address"
+msgid "What''s new..."
 msgstr ""
 
-msgid "locality"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "section"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "commune"
+msgid "Errr..."
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Browser not supported."
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Building address"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "skip"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "House number:"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Street:"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Post code:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Building:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Tags:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Name:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "updated building info"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Created area"
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Parcels."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
-msgstr "Ortschaft, Weiler, Stätte"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
+msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Angle Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "show address dialog"
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "merge nodes"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
+msgstr ""
+
+msgid "There is no frame loaded !"
+msgstr ""
+
+msgid "Alert Message"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Street Name:"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Create building"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Set buildings size"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Length step:"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "{0} not allowed with the current projection"
+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] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
-"<html>Namen des Ortes, Dorfes oder der Stadt eingeben.<br>Benutzen Sie die "
-"von www.cadastre.gouv.fr bekannte Syntax.</html>"
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
+"Ort/Stadt {0} nicht gefunden oder nicht verfügbar\n"
+"oder Aktion abgebrochen"
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflation"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Matches"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Reference only"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Configure"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Layers:"
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Conflate"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Parcels."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Locality, hamlet, place."
+msgstr "Ortschaft, Weiler, Stätte"
+
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder method"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Layer:"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "Subject"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "Create buildings"
 msgstr ""
 
-msgid "Restore subject selection"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Create boundary"
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Empty selection"
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Georeference an image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+msgid "Georeferencing interrupted"
 msgstr ""
 
-msgid "Requires restart"
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
+"<html>Namen des Ortes, Dorfes oder der Stadt eingeben.<br>Benutzen Sie die "
+"von www.cadastre.gouv.fr bekannte Syntax.</html>"
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29643,6 +29785,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29738,9 +29883,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30752,6 +30894,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31199,6 +31401,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32025,9 +32305,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32221,15 +32498,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/el.po b/i18n/po/el.po
index dbc34f6..68be6cc 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2016-01-25 09:17+0000\n"
 "Last-Translator: Aggelos Arnaoutis <angelosarn at hotmail.com>\n"
 "Language-Team: Greek <el at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:57+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:47+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: el\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -208,18 +208,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Προσθήκη επιπέδου υπόβαθρου εικόνων {0}"
 
-msgid "Error"
-msgstr "Σφάλμα"
-
-msgid "Select image format for WMS layer"
-msgstr "Επιλέξτε μορφή εικόνας για το επίπεδο WMS"
-
-msgid "Select WMS layers"
-msgstr "Επιλέξτε επίπεδα WMS"
-
-msgid "Add layers"
-msgstr "Προσθήκη επιπέδων WMS"
-
 msgid "Invalid service URL."
 msgstr "Άκυρη υπηρεσία URL."
 
@@ -232,6 +220,18 @@ msgstr "Η λίστα επιπέδων WMS δεν μπορεί να ανακτη
 msgid "Could not parse WMS layer list."
 msgstr "Δεν ήταν δυνατή η ανάλυση της λίστας επιπέδων WMS"
 
+msgid "Error"
+msgstr "Σφάλμα"
+
+msgid "Select image format for WMS layer"
+msgstr "Επιλέξτε μορφή εικόνας για το επίπεδο WMS"
+
+msgid "Select WMS layers"
+msgstr "Επιλέξτε επίπεδα WMS"
+
+msgid "Add layers"
+msgstr "Προσθήκη επιπέδων WMS"
+
 msgid "Add Node..."
 msgstr "Προσθήκη Κόμβου..."
 
@@ -3458,9 +3458,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3864,10 +3861,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3904,6 +3901,9 @@ msgstr "Ακτογραμμές"
 msgid "This test checks that coastlines are correct."
 msgstr "Αυτή η δοκιμή ελέγχει ότι οι ακτογραμμές είναι σωστές."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Ανάποδη ακτογραμμή: η ξηρά δεν είναι στην αριστερή πλευρά"
+
 msgid "Unconnected coastline"
 msgstr "Ασύνδετη ακτογραμμή"
 
@@ -3913,6 +3913,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr "Αντίθετη ακτογραμμή"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3949,6 +3952,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4171,6 +4180,12 @@ msgstr "Μη χρήσιμος ρόλος για μέλος πολύ-πολυγώ
 msgid "Non-Way in multipolygon"
 msgstr "Μή διαδρομή στο πολύ-πολύγωνο"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Απουσία μετάφρασης name:*"
 
@@ -4387,30 +4402,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Οι τιμές της ιδιότητας περιέχουν HTML στοιχεία"
 
+msgid "Misspelled property key"
+msgstr ""
+
 msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
-msgid "Misspelled property key"
+msgid "Presets do not contain property key"
 msgstr ""
 
 msgid "Key ''{0}'' not in presets."
 msgstr "Το κλειδί \"{0}\" δεν υπάρχει στις προεπιλογές"
 
-msgid "Presets do not contain property key"
+msgid "Misspelled property value"
 msgstr ""
 
 msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
-msgid "Misspelled property value"
+msgid "Presets do not contain property value"
 msgstr ""
 
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Η τιμή \"{0}\" για το κλειδί \"{1}\" δεν υπάρχει στις προεπιλογές."
 
-msgid "Presets do not contain property value"
-msgstr ""
-
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4664,9 +4679,6 @@ msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 "Αυτή η δοκιμή ελέγχει την κατεύθυνση διαδρομών νερού, γης και ακτογραμμών."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Ανάποδη ακτογραμμή: η ξηρά δεν είναι στην αριστερή πλευρά"
-
 msgid "Reversed land: land not on left side"
 msgstr "Αντίστροφη ξηρά: η ξηρά δεν είναι στην αριστερή πλευρά"
 
@@ -5197,9 +5209,6 @@ msgstr "Το γεωγραφικό μήκος στο σημείο του ποντ
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "το επίπεδο δεν είναι στη λίστα."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6645,6 +6654,9 @@ msgstr "Ταξινόμηση σημειώσεων"
 msgid "Sort"
 msgstr "Ταξινόμηση"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Τύπος αντικειμένου:"
 
@@ -6893,6 +6905,14 @@ msgid "Download the content of the selected changesets from the server"
 msgstr ""
 "Λήψη των περιεχομένων των επιλεγμένων ομάδων αλλαγών από τον διακομιστή"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Οι ομάδες αλλαγών μου"
 
@@ -8185,9 +8205,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr "Περιοχές γύρω από τοποθεσίες"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr "Αναζήτηση ..."
 
@@ -8765,6 +8782,9 @@ msgstr "Μη αποθηκευμένες αλλαγές - Αποθήκευση/Α
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Μη αποθηκευμένες αλλαγές - Αποθήκευση/Αποστολή πριν την διαγραφή;"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Αποστολή και αποθήκευση αλλαγμένων επιπέδων ..."
 
@@ -8817,6 +8837,12 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "Κλείσιμο του JOSM χωρίς αποθήκευση. Οι μη αποθηκευμένες αλλαγές θα χαθούν."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Διαγραφή τώρα!"
 
@@ -8832,6 +8858,12 @@ msgstr ""
 "Έξοδος από το JOSM με αποθήκευση. Οι μη αποθηευμένες αλλαγές θα αποσταλλούν "
 "και/ή θα αποθηκευθούν."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Εκτέλεση εργασιών πριν την διαγραφή"
 
@@ -10928,6 +10960,9 @@ msgstr "Σχεδιασμός βελών μονοδρόμησης"
 msgid "Draw segment order numbers"
 msgstr "Σχεδιασμός αριθμών σειράς τμημάτων"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Σχεδιασμός ορίων δεδομένων που έχουν ληφθεί"
 
@@ -13043,6 +13078,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "Αποτυχία εισαγωγής NMEA!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13407,6 +13445,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -15079,6 +15120,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15190,7 +15234,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15369,6 +15416,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15663,18 +15713,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15684,6 +15722,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15816,6 +15857,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -16183,6 +16227,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Λήψη δεδομένων OSM κατά μήκος μιας διαδρομής"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16297,6 +16344,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16494,6 +16544,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16516,6 +16571,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16675,6 +16733,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17995,6 +18057,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Κοιτόστρωση"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19614,6 +19679,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr "Τροχόδρομος"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -20284,11 +20352,11 @@ msgstr "Αριθμός Σημείου"
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
-msgid "Phone Number"
-msgstr "Αριθμός Τηλεφώνου"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Κτηνιατρείο"
@@ -20302,6 +20370,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Αριθμός Τηλεφώνου"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -21171,6 +21245,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -21255,6 +21333,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Stufen"
 
@@ -23460,7 +23542,13 @@ msgstr "Εθνικός Δρυμός"
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -24127,16 +24215,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -24145,18 +24227,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24169,18 +24239,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24373,9 +24431,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24385,6 +24454,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24400,39 +24475,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24451,9 +24511,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} είναι παρωχημένο"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24508,10 +24577,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24527,7 +24602,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24572,7 +24647,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24606,6 +24681,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24624,6 +24702,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24714,10 +24795,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24963,6 +25047,27 @@ msgstr "Αποστολή Ίχνους GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Αποστολή ιχνών στο openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Γίνεται εισαγωγή..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Κλίμακα:"
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr "μ"
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25303,3294 +25408,3331 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
-msgstr "Μονά"
-
-msgid "Even"
-msgstr "Ζυγά"
-
-msgid "Alphabetic"
-msgstr "Αλφαβητικά"
+msgid "Select a folder"
+msgstr ""
 
-msgid "Numeric"
-msgstr "Αριθμητικό"
+msgid "Explore"
+msgstr ""
 
-msgid "Actual"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Estimate"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Potential"
+msgid "Give way"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "No entry"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Increment:"
-msgstr "Αύξηση:"
+msgid "Uneven road"
+msgstr ""
 
-msgid "Starting #:"
+msgid "No parking"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Accuracy:"
-msgstr "Ακρίβεια:"
+msgid "Pedestrian crossing"
+msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "No turn"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Years"
 msgstr ""
 
-msgid "City:"
-msgstr "Πόλη:"
+msgid "Months"
+msgstr ""
 
-msgid "State:"
+msgid "Days"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Imported images"
 msgstr ""
 
-msgid "Country:"
-msgstr "Χώρα:"
+msgid "Mapillary filter"
+msgstr ""
 
-msgid "Full Address:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
-msgstr "Αναμένονταν μονοί αριθμοί για τις διευθύνσεις"
+msgid "Choose signs"
+msgstr ""
 
-msgid "Expected even numbers for addresses"
-msgstr "Αναμένονταν ζυγοί αριθμοί για τις διευθύνσεις"
+msgid "Mapillary history"
+msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
-msgstr "Οι αλφαβητικές διευθύνσεις πρέπει να τελειώνουν με γράμμα"
+msgid "Mapillary dialog"
+msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Open Mapillary main dialog"
 msgstr ""
-"Ο αρχικός και ο τελικός αριθμός πρέπει να είναι ίδιος για τις αλφαβητικές "
-"διευθύνσεις"
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Jump to blue"
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Pause"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Align way segment"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Login"
 msgstr ""
 
-msgid "Length preserved"
+msgid "Logout"
 msgstr ""
 
-msgid "Angle preserved"
+msgid "Download mode"
 msgstr ""
 
-msgid "Align with:"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "Align Ways mode"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "Parameter ''{0}'' must not be null"
+msgid "Go forward"
 msgstr ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+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 "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
-msgstr "Αριθμός σπιτιού"
-
-msgid "Street:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Building:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Tags:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Name:"
-msgstr "Όνομα:"
-
-msgid "updated building info"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Building"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Tools: {0}"
-msgstr "Εργαλεία: {0}"
-
-msgid "Area Selection"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Created area"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Error Report"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Algorithm"
+msgid "edit existing tag"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "edit new tag"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Choose key"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid "show address dialog"
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "merge nodes"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Debug"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Street Name:"
-msgstr "Όνομα Οδού:"
+msgid "Define Address Interpolation"
+msgstr ""
 
-msgid "Big buildings mode"
-msgstr "Λειτουργία μεγάλων κτηρίων"
+msgid "Odd"
+msgstr "Μονά"
 
-msgid "Rotate crosshair"
-msgstr ""
+msgid "Even"
+msgstr "Ζυγά"
 
-msgid "Advanced settings"
-msgstr "Προχωρημένες ρυθμίσεις"
+msgid "Alphabetic"
+msgstr "Αλφαβητικά"
 
-msgid "Buildings tags:"
-msgstr "Ετικέτες κτηρίων:"
+msgid "Numeric"
+msgstr "Αριθμητικό"
 
-msgid "Cannot place building outside of the world."
+msgid "Actual"
 msgstr ""
 
-msgid "Create building"
+msgid "Estimate"
 msgstr ""
 
-msgid "Set buildings size"
-msgstr "Ορισμός μεγέθους κτηρίων"
+msgid "Potential"
+msgstr ""
 
-msgid "Use Address dialog"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Buildings width:"
-msgstr "Πλάτος κτηρίων:"
+msgid "Increment:"
+msgstr "Αύξηση:"
 
-msgid "Length step:"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Advanced..."
-msgstr "Για προχωρημένους…"
-
-msgid "Draw buildings"
-msgstr "Σχεδίαση κτηρίων"
-
-msgid "Point on the corner of the building to start drawing"
-msgstr ""
-
-msgid "Point on opposite end of the building"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Set width of the building"
-msgstr ""
+msgid "Accuracy:"
+msgstr "Ακρίβεια:"
 
-msgid "Merge address points"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
-msgstr ""
+msgid "City:"
+msgstr "Πόλη:"
 
-msgid "No address nodes found in the selection"
+msgid "State:"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Post Code:"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Country:"
+msgstr "Χώρα:"
 
-msgid "No address nodes inside buildings found"
+msgid "Full Address:"
 msgstr ""
 
-msgid "on polygon"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Add address"
-msgstr "Προσθήκη διεύθυνσης"
-
-msgid "Helping tool for tag address"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Next no"
-msgstr ""
+msgid "Expected odd numbers for addresses"
+msgstr "Αναμένονταν μονοί αριθμοί για τις διευθύνσεις"
 
-msgid "Enter addresses"
-msgstr "Εισαγωγή διευθύνσεων"
+msgid "Expected even numbers for addresses"
+msgstr "Αναμένονταν ζυγοί αριθμοί για τις διευθύνσεις"
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
-msgstr ""
+msgid "Alphabetic address must end with a letter"
+msgstr "Οι αλφαβητικές διευθύνσεις πρέπει να τελειώνουν με γράμμα"
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
+"Ο αρχικός και ο τελικός αριθμός πρέπει να είναι ίδιος για τις αλφαβητικές "
+"διευθύνσεις"
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
-msgstr ""
-
-msgid "Choose from..."
-msgstr "Επιλέξτε από..."
-
-msgid "Select commune"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
-msgstr "Αντικατάσταση αρχικού φόντου με το χρώμα φόντου του JOSM."
-
-msgid "Reverse grey colors (for black backgrounds)."
-msgstr "Αντιστροφή γκρι χρωμάτων (για μαύρο φόντο)."
-
-msgid "Set background transparent."
-msgstr "Διαφανές φόντο."
-
-msgid "Draw boundaries of downloaded data."
-msgstr "Σχεδιασμός ορίων δεδομένων που λήφθηκαν."
-
-msgid "Disable image cropping during georeferencing."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid "Align way segment"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Align Ways control panel"
 msgstr ""
-"Μη χρησιμοποίηση σχέσης για διευθύνσεις (αλλά \"addr:street\" στα στοιχεία)"
-
-msgid "off"
-msgstr "κλειστό"
-
-msgid "25 m"
-msgstr "25 μ"
-
-msgid "50 m"
-msgstr "50 μ"
-
-msgid "100 m"
-msgstr "100 μ"
-
-msgid "high"
-msgstr "υψηλό"
-
-msgid "medium"
-msgstr "μεσαίο"
 
-msgid "low"
-msgstr "χαμηλό"
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
 
-msgid "symbol"
+msgid "Length preserved"
 msgstr ""
 
-msgid "parcel"
+msgid "Angle preserved"
 msgstr ""
 
-msgid "parcel number"
+msgid "Align with:"
 msgstr ""
 
-msgid "address"
-msgstr "διεύθυνση"
+msgid ""
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
+msgstr ""
 
-msgid "locality"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "section"
+msgid "I''m ready!"
 msgstr ""
 
-msgid "commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
-"Ρύθμιση διαφάνειας επιπέδων WMS. Δεξιά για αδιαφανές, αριστερά για διαφανές."
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Image resolution:"
-msgstr "Ανάλυση εικόνας:"
-
-msgid "High resolution (1000x800)"
-msgstr "Υψηλή ανάλυση (1000x800)"
-
-msgid "Medium resolution (800x600)"
-msgstr "Μεσαία ανάλυση (800x600)"
-
-msgid "Low resolution (600x400)"
-msgstr "Χαμηλή ανάλυση (600x400"
-
-msgid "Image filter interpolation:"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
-msgstr "Σταθερό μέγεθος (από 25 έως 1000 μέτρα)"
-
-msgid "Layers:"
-msgstr "Επίπεδα:"
-
-msgid "Sea, rivers, swimming pools."
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
-msgstr "Κτήρια, υπόστεγα, υπόγειες κατασκευές."
-
-msgid "Symbols like cristian cross."
+msgid "What''s new..."
 msgstr ""
 
-msgid "Parcels."
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Errr..."
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid "Browser not supported."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Building address"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "empty"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
-msgstr ""
+msgid "House number:"
+msgstr "Αριθμός σπιτιού"
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Street:"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Post code:"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Building:"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Tags:"
 msgstr ""
-"Τα παλαιότερα αρχεία διαγράφονται αυτόματα όταν ξεπεραστεί αυτό το μέγεθος"
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
-msgstr ""
+msgid "Name:"
+msgstr "Όνομα:"
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "updated building info"
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
-msgstr "Προσθήκη \"source=...\" στα στοιχεία;"
-
-msgid "Downloading {0}"
-msgstr "Γίνεται λήψη {0}"
+msgid "Select an item to tag."
+msgstr ""
 
-msgid "Contacting WMS Server..."
-msgstr "Επικοινωνία με διακομιστή WMS..."
+msgid "Tag Building"
+msgstr ""
 
-msgid "Create buildings"
-msgstr "Δημιουργία κτηρίων"
+msgid "Tools: {0}"
+msgstr "Εργαλεία: {0}"
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Area Selector"
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Created area"
 msgstr ""
 
-msgid "Create boundary"
-msgstr "Δημιουργία ορίου"
-
-msgid "Contacting cadastre WMS ..."
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Error Report"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Something went wrong!"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Only on vectorized layers"
-msgstr "Μόνο σε διανυσματικά επίπεδα"
-
-msgid "Cancel current grab"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "{0} not allowed with the current projection"
+msgid "Color Threshold"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "(optional)"
-msgstr "(προαιρετικό)"
-
-msgid "Change location"
-msgstr "Αλλαγή θέσης"
-
-msgid "Set a new location for the next request"
-msgstr "Ρύθμιση νέας θέσης για την επόμενη αίτηση"
-
-msgid "Add a new municipality layer"
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Commune"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Departement"
+msgid "merge nodes"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Add new layer"
-msgstr "Προσθήκη νέου επιπέδου"
-
-msgid "Open Cadastre Preferences"
+msgid "Debug"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Reset cookie"
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Save image as..."
+msgid "Alert Message"
 msgstr ""
 
-msgid "PNG files (*.png)"
-msgstr "Αρχεία PNG (*.png)"
+msgid "Street Name:"
+msgstr "Όνομα Οδού:"
 
-msgid "GeoTiff files (*.tif)"
-msgstr ""
+msgid "Big buildings mode"
+msgstr "Λειτουργία μεγάλων κτηρίων"
 
-msgid "Export image (only raster images)"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
+msgid "Advanced settings"
+msgstr "Προχωρημένες ρυθμίσεις"
 
-msgid "Image cropping"
-msgstr ""
+msgid "Buildings tags:"
+msgstr "Ετικέτες κτηρίων:"
 
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Create building"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
+msgid "Set buildings size"
+msgstr "Ορισμός μεγέθους κτηρίων"
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Auto-select building"
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "East"
-msgstr "Ανατολή"
+msgid "Buildings width:"
+msgstr "Πλάτος κτηρίων:"
 
-msgid "I use the mouse"
+msgid "Length step:"
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
-msgstr ""
+msgid "Advanced..."
+msgstr "Για προχωρημένους…"
 
-msgid "Click second corner for image cropping"
+msgid "Draw buildings"
+msgstr "Σχεδίαση κτηρίων"
+
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Adjust WMS"
-msgstr "Ρύθμιση WMS"
+msgid "Set width of the building"
+msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "Merge address points"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
-"Περισσότερα από ένα επίπεδα WMS\n"
-"Επιλέξτε ένα από αυτά πρώτα και μετά ξαναπροσπαθήστε"
 
-msgid "Reset offset"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "Blank Layer"
-msgstr "Άδειο επίπεδο"
+msgid "No building ways found in the selection"
+msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr "Επίπεδο WMS ({0}), {1} πλακίδιο(α) φορτώθηκαν"
+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] ""
 
-msgid "Is not vectorized."
-msgstr "Δεν είναι διανυσματικό."
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Bounding box: {0}"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "on polygon"
 msgstr ""
 
-msgid "Is vectorized."
-msgstr "Είναι διανυσματικό."
+msgid "Add address"
+msgstr "Προσθήκη διεύθυνσης"
 
-msgid "Commune bbox: {0}"
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "Next no"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
+msgid "Enter addresses"
+msgstr "Εισαγωγή διευθύνσεων"
 
-msgid "Cache Lambert Zone Error"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "Select Feuille"
 msgstr ""
 
-msgid "Use"
-msgstr "Να χρησιμοποιηθεί"
-
-msgid "Please select a scheme to use."
-msgstr "Παρακαλώ επιλέξτε ένα θέμα για χρήση."
-
-msgid "Color Scheme"
-msgstr "Θέμα χρωμάτων"
-
-msgid "Please select the scheme to delete."
-msgstr "Παρακαλώ επιλέξτε το θέμα προς διαγραφή"
-
-msgid "Use the selected scheme from the list."
-msgstr "Χρήση του επιλεγμένου θέματος από την λίστα."
-
-msgid "Use the current colors as a new color scheme."
-msgstr "Χρήση των τρεχόντων χρωμάτων ως νέο θέμα."
-
-msgid "Delete the selected scheme from the list."
-msgstr "Διαγραφή του επιλεγμένου θέματος από την λίστα."
-
-msgid "Color Schemes"
-msgstr "Θέματα χρωμάτων"
-
-msgid "Conflate object pair"
+msgid ""
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Lambert Zone {0} cache file (.{0})"
+msgstr ""
 
-msgid "Conflation"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Matches"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Reference only"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "Configure"
-msgstr "Ρύθμιση"
+msgid "Choose from..."
+msgstr "Επιλέξτε από..."
 
-msgid "Configure conflation options"
+msgid "Select commune"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Auto sourcing"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
-msgid "Conflate"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Change the current projection"
 msgstr ""
 
-msgid "Conflation: {0}"
-msgstr ""
+msgid "Replace original background by JOSM background color."
+msgstr "Αντικατάσταση αρχικού φόντου με το χρώμα φόντου του JOSM."
 
-msgid "Cannot replace geometry."
-msgstr ""
+msgid "Reverse grey colors (for black backgrounds)."
+msgstr "Αντιστροφή γκρι χρωμάτων (για μαύρο φόντο)."
 
-msgid "Zoom to selected primitive(s)"
-msgstr ""
+msgid "Set background transparent."
+msgstr "Διαφανές φόντο."
 
-msgid "Select selected primitive(s)"
-msgstr ""
+msgid "Draw boundaries of downloaded data."
+msgstr "Σχεδιασμός ορίων δεδομένων που λήφθηκαν."
 
-msgid "Select the primitives currently selected in the list"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
+"Μη χρησιμοποίηση σχέσης για διευθύνσεις (αλλά \"addr:street\" στα στοιχεία)"
 
-msgid "Centroid distance"
-msgstr ""
+msgid "off"
+msgstr "κλειστό"
 
-msgid "Hausdorff distance"
-msgstr ""
+msgid "25 m"
+msgstr "25 μ"
 
-msgid "Configure conflation settings"
-msgstr ""
+msgid "50 m"
+msgstr "50 μ"
 
-msgid "Generate matches"
-msgstr ""
+msgid "100 m"
+msgstr "100 μ"
 
-msgid "Layer:"
-msgstr ""
+msgid "high"
+msgstr "υψηλό"
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
-msgstr ""
+msgid "medium"
+msgstr "μεσαίο"
 
-msgid "Subject"
-msgstr ""
+msgid "low"
+msgstr "χαμηλό"
 
-msgid "Selections must be made for both reference and subject."
+msgid "symbol"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "parcel"
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "parcel number"
 msgstr ""
 
-msgid "Restore reference selection"
-msgstr ""
+msgid "address"
+msgstr "διεύθυνση"
 
-msgid "Freeze subject selection"
+msgid "locality"
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "section"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "commune"
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Empty selection"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
+"Ρύθμιση διαφάνειας επιπέδων WMS. Δεξιά για αδιαφανές, αριστερά για διαφανές."
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Download Settings"
+msgid "Image resolution:"
+msgstr "Ανάλυση εικόνας:"
+
+msgid "High resolution (1000x800)"
+msgstr "Υψηλή ανάλυση (1000x800)"
+
+msgid "Medium resolution (800x600)"
+msgstr "Μεσαία ανάλυση (800x600)"
+
+msgid "Low resolution (600x400)"
+msgstr "Χαμηλή ανάλυση (600x400"
+
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Requires restart"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Max threads"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+msgid "Fixed size (from 25 to 1000 meters)"
+msgstr "Σταθερό μέγεθος (από 25 έως 1000 μέτρα)"
+
+msgid "Layers:"
+msgstr "Επίπεδα:"
+
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid "Buildings, covers, underground constructions."
+msgstr "Κτήρια, υπόστεγα, υπόγειες κατασκευές."
+
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "Parcels."
 msgstr ""
 
-msgid "Extra download area"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Max download area"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Download strategy"
+msgid "Municipality administrative borders."
+msgstr ""
+
+msgid "Raster images grab multiplier:"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Split area"
-msgstr "Διαίρεση περιοχής"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Allows an automatic caching"
 msgstr ""
-"Η επιλεγμένη διαδρομή δεν μπορεί να διαιρεθεί, γιατί είναι μέλος κάποιας "
-"σχέσης.\n"
-"Αφαιρέστε την περιοχή από την σχέση πριν τη διαιρέσετε."
 
-msgid "TangoGPS Files (*.log)"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
+"Τα παλαιότερα αρχεία διαγράφονται αυτόματα όταν ξεπεραστεί αυτό το μέγεθος"
 
-msgid "Coordinates imported: "
-msgstr "Εισήχθησαν συντεταγμένες: "
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
+msgstr ""
 
-msgid "Format errors: "
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Add \"source=...\" to elements?"
+msgstr "Προσθήκη \"source=...\" στα στοιχεία;"
+
+msgid "Downloading {0}"
+msgstr "Γίνεται λήψη {0}"
+
+msgid "Contacting WMS Server..."
+msgstr "Επικοινωνία με διακομιστή WMS..."
+
+msgid "Create buildings"
+msgstr "Δημιουργία κτηρίων"
+
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Download along..."
-msgstr "Λήψη κατά μήκος..."
+msgid "Extract SVG ViewBox..."
+msgstr ""
 
-msgid "Download OSM data along the selected ways."
-msgstr "Λήψη δεδομένων OSM κατά μήκος των επιλεγμένων διαδρομών."
+msgid "Extract best fitting boundary..."
+msgstr ""
 
-msgid "Download Along"
-msgstr "Λήψη κατά Μήκος"
+msgid "Create boundary"
+msgstr "Δημιουργία ορίου"
 
-msgid "Please select 1 or more ways to download along"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
-"Παρακαλώ επιλέξτε 1 ή περισσότερες διαδρομές για να γίνει λήψη κατά μήκος"
 
-msgid "Download from OSM along selected ways"
+msgid "Image already loaded"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "EditGpx"
-msgstr ""
+msgid "Only on vectorized layers"
+msgstr "Μόνο σε διανυσματικά επίπεδα"
 
-msgid "Layer for editing GPX tracks"
-msgstr "Επίπεδο για επεξεργασία ιχνών GPX"
+msgid "Cancel current grab"
+msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "edit gpx tracks"
-msgstr "επεξεργασία ιχνών GPX"
+msgid "Cadastre grab"
+msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Georeference an image"
 msgstr ""
 
-msgid "External tool error"
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Edit tool"
-msgstr "Επεξεργασία εργαλείου"
+msgid "{0} not allowed with the current projection"
+msgstr ""
 
-msgid "CmdLine:"
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "External tools"
-msgstr "Εξωτερικά εργαλεία"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgstr ""
 
-msgid "Delete tool \"{0}\"?"
-msgstr "Διαγραφή εργαλείου \"{0}\";"
+msgid "The location {0} is already on screen. Cache not loaded."
+msgstr ""
 
-msgid "Are you sure?"
-msgstr "Είστε σίγουροι;"
+msgid "(optional)"
+msgstr "(προαιρετικό)"
 
-msgid "New tool..."
-msgstr "Νέο εργαλείο..."
+msgid "Change location"
+msgstr "Αλλαγή θέσης"
 
-msgid "Install"
-msgstr "Εγκατάσταση"
+msgid "Set a new location for the next request"
+msgstr "Ρύθμιση νέας θέσης για την επόμενη αίτηση"
 
-msgid "Public"
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid "Commune"
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Departement"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid "GeoChat"
+msgid "Add new layer"
+msgstr "Προσθήκη νέου επιπέδου"
+
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "Login"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Save image as..."
+msgstr ""
 
-msgid "not logged in"
+msgid "PNG files (*.png)"
+msgstr "Αρχεία PNG (*.png)"
+
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Failed to send message:"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Image cropping"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "Users mapping nearby:"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "Private chat"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "Close tab"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Logout"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Clear log"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "Show users on map"
+msgid "East"
+msgstr "Ανατολή"
+
+msgid "I use the mouse"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Adjust WMS"
+msgstr "Ρύθμιση WMS"
+
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "Position only"
-msgstr "Θέση μόνο"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
+msgstr ""
+"Περισσότερα από ένα επίπεδα WMS\n"
+"Επιλέξτε ένα από αυτά πρώτα και μετά ξαναπροσπαθήστε"
 
-msgid "Position, Time, Date, Speed"
-msgstr "Θέση, Ώρα, Ημερομηνία, Ταχύτητα"
+msgid "Reset offset"
+msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
-msgstr "Θέση, Ώρα, Ημερομηνία, Ταχύτητα, Υψόμετρο"
+msgid "Reset offset (only vector images)"
+msgstr ""
 
-msgid "A By Time"
-msgstr "Α κατά Ώρα"
+msgid "Blank Layer"
+msgstr "Άδειο επίπεδο"
 
-msgid "A By Distance"
-msgstr "Α κατά Απόσταση"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr "Επίπεδο WMS ({0}), {1} πλακίδιο(α) φορτώθηκαν"
 
-msgid "B By Time"
-msgstr "Β κατά Ώρα"
+msgid "Is not vectorized."
+msgstr "Δεν είναι διανυσματικό."
 
-msgid "B By Distance"
-msgstr "Β κατά Απόσταση"
+msgid "Bounding box: {0}"
+msgstr ""
 
-msgid "C By Time"
-msgstr "C κατά Ώρα"
+msgid "Image size (px): {0}/{1}"
+msgstr ""
 
-msgid "C By Distance"
-msgstr "C κατά Απόσταση"
+msgid "Is vectorized."
+msgstr "Είναι διανυσματικό."
 
-msgid "Data Logging Format"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Port:"
-msgstr "Θύρα:"
+msgid "Cache Lambert Zone Error"
+msgstr ""
 
-msgid "refresh the port list"
-msgstr "ανανέωση της λίστας θυρών"
+msgid "canvec tile helper"
+msgstr ""
 
-msgid "Configure Device"
-msgstr "Ρύθμιση συσκευής"
+msgid "Use"
+msgstr "Να χρησιμοποιηθεί"
 
-msgid "Connection Error."
-msgstr "Σφάλμα Σύνδεσης."
+msgid "Please select a scheme to use."
+msgstr "Παρακαλώ επιλέξτε ένα θέμα για χρήση."
 
-msgid "configure the connected DG100"
-msgstr "ρύθμιση του συνδεδεμένου DG100"
+msgid "Color Scheme"
+msgstr "Θέμα χρωμάτων"
 
-msgid "delete data after import"
-msgstr "διαγραφή δεδομένων μετά την εισαγωγή"
+msgid "Please select the scheme to delete."
+msgstr "Παρακαλώ επιλέξτε το θέμα προς διαγραφή"
 
-msgid "Importing data from device."
-msgstr "Εισαγωγή δεδομένων από την συσκευή."
+msgid "Use the selected scheme from the list."
+msgstr "Χρήση του επιλεγμένου θέματος από την λίστα."
 
-msgid "Importing data from DG100..."
-msgstr "Εισαγωγή δεδομένων από το DG100..."
+msgid "Use the current colors as a new color scheme."
+msgstr "Χρήση των τρεχόντων χρωμάτων ως νέο θέμα."
 
-msgid "Error deleting data."
-msgstr "Σφάλαμ κατά την διαγραφή των δεδομένων."
+msgid "Delete the selected scheme from the list."
+msgstr "Διαγραφή του επιλεγμένου θέματος από την λίστα."
 
-msgid "imported data from {0}"
-msgstr "εισήχθησαν  δεδομένα από {0}"
+msgid "Color Schemes"
+msgstr "Θέματα χρωμάτων"
 
-msgid "No data found on device."
-msgstr "Δεν βρέθηκαν δεδομένα στη συσκευή."
+msgid "Conflate object pair"
+msgstr ""
 
-msgid "Connection failed."
-msgstr "Η σύνδεση απέτυχε."
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Conflation"
 msgstr ""
 
-msgid "Globalsat Import"
-msgstr "Εισαγωγή Globalsat"
+msgid "Activates the conflation plugin"
+msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr "Εισαγωγή δεδομένων από Globalsat Datalogger DG100 στο επίπεδο GPX."
+msgid "Matches"
+msgstr ""
 
-msgid "Import"
-msgstr "Εισαγωγή"
+msgid "Reference only"
+msgstr ""
 
-msgid "GPS Blams"
+msgid "Subject only"
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Configure"
+msgstr "Ρύθμιση"
+
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "Class element without name"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Conflate"
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "Tag without key"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Layer:"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Subject"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Restore subject selection"
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "Empty selection"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "No ruleset"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "height (m)"
-msgstr "ύψος (μ)"
-
-msgid "width (m)"
-msgstr "πλάτος (μ)"
-
-msgid "length (m)"
-msgstr "μήκος (μ)"
+msgid "Supress the default modal progress monitor when downloading."
+msgstr ""
 
-msgid "speed (km/h)"
-msgstr "ταχύτητα (χλμ/ω)"
+msgid "Download Settings"
+msgstr ""
 
-msgid "weight (t)"
-msgstr "βάρος (τ)"
+msgid "Settings for the continuous download."
+msgstr ""
 
-msgid "axleload (t)"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Bookmark name"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "Max threads"
 msgstr ""
 
-msgid "Access class"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Road requirements"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "Max download area"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Download strategy"
 msgstr ""
 
 msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "max. tracktype grade"
-msgstr ""
+msgid "Split area"
+msgstr "Διαίρεση περιοχής"
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Splits an area by an untagged way."
 msgstr ""
-"Χειρότερος τύπος χωματόδρομου (1-5) προσπελάσιμο από όχημα, 0 απροσπέλαστο"
 
-msgid "Change bookmark"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
+"Η επιλεγμένη διαδρομή δεν μπορεί να διαιρεθεί, γιατί είναι μέλος κάποιας "
+"σχέσης.\n"
+"Αφαιρέστε την περιοχή από την σχέση πριν τη διαιρέσετε."
 
-msgid "Edit access parameters"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Graph View Dialog"
-msgstr ""
+msgid "Coordinates imported: "
+msgstr "Εισήχθησαν συντεταγμένες: "
 
-msgid "Open the dialog for graph view configuration."
+msgid "Format errors: "
 msgstr ""
 
-msgid "default"
-msgstr "προκαθορισμένο"
-
-msgid "end nodes"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "incline"
-msgstr "κλίση"
+msgid "TangoGPS import failure!"
+msgstr ""
 
-msgid "Ruleset:"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "Parameters:"
-msgstr "Παράμετροι:"
+msgid "Download along..."
+msgstr "Λήψη κατά μήκος..."
 
-msgid "Coloring:"
-msgstr ""
+msgid "Download OSM data along the selected ways."
+msgstr "Λήψη δεδομένων OSM κατά μήκος των επιλεγμένων διαδρομών."
 
-msgid "Create/update graph"
-msgstr ""
+msgid "Download Along"
+msgstr "Λήψη κατά Μήκος"
 
-msgid "Graphview"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
+"Παρακαλώ επιλέξτε 1 ή περισσότερες διαδρομές για να γίνει λήψη κατά μήκος"
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Ruleset"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "Select directory"
-msgstr "Επιλέξτε κατάλογο"
-
-msgid "Vehicle"
-msgstr "Όχημα"
-
-msgid "Restore defaults"
+msgid "EditGpx"
 msgstr ""
 
-msgid "Visualization"
-msgstr "Οπτικοποίηση"
+msgid "Layer for editing GPX tracks"
+msgstr "Επίπεδο για επεξεργασία ιχνών GPX"
 
-msgid "Draw directions separately"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "Node color"
-msgstr "Χρώμα κόμβου"
-
-msgid "Arrow color"
-msgstr "Χρώμα βέλους"
+msgid "edit gpx tracks"
+msgstr "επεξεργασία ιχνών GPX"
 
-msgid "Arrowhead fill color"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "New bookmark"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "External tool error"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "Error executing the script:"
 msgstr ""
 
 msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Choose node color"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Choose arrow color"
-msgstr ""
+msgid "Edit tool"
+msgstr "Επεξεργασία εργαλείου"
 
-msgid "Choose arrowhead fill color"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
-msgstr ""
+msgid "External tools"
+msgstr "Εξωτερικά εργαλεία"
 
-msgid "GraphView layer is not mergable"
-msgstr ""
+msgid "Delete tool \"{0}\"?"
+msgstr "Διαγραφή εργαλείου \"{0}\";"
 
-msgid "graphview default node"
-msgstr ""
+msgid "Are you sure?"
+msgstr "Είστε σίγουροι;"
 
-msgid "graphview default segment"
-msgstr ""
+msgid "New tool..."
+msgstr "Νέο εργαλείο..."
 
-msgid "graphview arrowhead core"
-msgstr ""
+msgid "Install"
+msgstr "Εγκατάσταση"
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Public"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Failed to get messages as {0}:"
 msgstr ""
-"ΟΙ βαθμονομήσεις χωματόδρομου πρέπει να δίνονται σαν ακέραιοι μεταξύ 0 και 5"
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "GeoChat"
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "Private chat"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "Close tab"
 msgstr ""
 
-msgid "Change Color"
+msgid "Clear log"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
-msgstr ""
+msgid "Position only"
+msgstr "Θέση μόνο"
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Position, Time, Date, Speed"
+msgstr "Θέση, Ώρα, Ημερομηνία, Ταχύτητα"
+
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr "Θέση, Ώρα, Ημερομηνία, Ταχύτητα, Υψόμετρο"
+
+msgid "A By Time"
+msgstr "Α κατά Ώρα"
+
+msgid "A By Distance"
+msgstr "Α κατά Απόσταση"
+
+msgid "B By Time"
+msgstr "Β κατά Ώρα"
+
+msgid "B By Distance"
+msgstr "Β κατά Απόσταση"
+
+msgid "C By Time"
+msgstr "C κατά Ώρα"
+
+msgid "C By Distance"
+msgstr "C κατά Απόσταση"
+
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Unknown logFormat"
 msgstr ""
 
+msgid "Port:"
+msgstr "Θύρα:"
+
+msgid "refresh the port list"
+msgstr "ανανέωση της λίστας θυρών"
+
+msgid "Configure Device"
+msgstr "Ρύθμιση συσκευής"
+
+msgid "Connection Error."
+msgstr "Σφάλμα Σύνδεσης."
+
+msgid "configure the connected DG100"
+msgstr "ρύθμιση του συνδεδεμένου DG100"
+
+msgid "delete data after import"
+msgstr "διαγραφή δεδομένων μετά την εισαγωγή"
+
+msgid "Importing data from device."
+msgstr "Εισαγωγή δεδομένων από την συσκευή."
+
+msgid "Importing data from DG100..."
+msgstr "Εισαγωγή δεδομένων από το DG100..."
+
+msgid "Error deleting data."
+msgstr "Σφάλαμ κατά την διαγραφή των δεδομένων."
+
+msgid "imported data from {0}"
+msgstr "εισήχθησαν  δεδομένα από {0}"
+
+msgid "No data found on device."
+msgstr "Δεν βρέθηκαν δεδομένα στη συσκευή."
+
+msgid "Connection failed."
+msgstr "Η σύνδεση απέτυχε."
+
 msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Loading imagery offsets..."
-msgstr ""
+msgid "Globalsat Import"
+msgstr "Εισαγωγή Globalsat"
 
-msgid "Error processing XML response: {0}"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgstr "Εισαγωγή δεδομένων από Globalsat Datalogger DG100 στο επίπεδο GPX."
+
+msgid "Import"
+msgstr "Εισαγωγή"
+
+msgid "GPS Blams"
 msgstr ""
 
-msgid "Offset"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "mm"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "cm"
+msgid "GPX Data"
 msgstr ""
 
-msgid "m"
-msgstr "μ"
+msgid "Classes element below root child level"
+msgstr ""
 
-msgid "km"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Class element without name"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Tag without key"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Offset Information"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "Determined right here"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "Reason"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "Start adjusting"
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "File not found:\n"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Normal"
-msgstr "Κανονική"
+msgid "height (m)"
+msgstr "ύψος (μ)"
 
-msgid "Rotate 90"
-msgstr "Περιστροφή 90"
+msgid "width (m)"
+msgstr "πλάτος (μ)"
 
-msgid "Rotate 180"
-msgstr "Περιστροφή 180"
+msgid "length (m)"
+msgstr "μήκος (μ)"
 
-msgid "Rotate 270"
-msgstr "Περιστροφή 270"
+msgid "speed (km/h)"
+msgstr "ταχύτητα (χλμ/ω)"
 
-msgid "Previous image"
-msgstr "Προηγούμενη εικόνα"
+msgid "weight (t)"
+msgstr "βάρος (τ)"
 
-msgid "Next image"
-msgstr "Επόμενη εικόνα"
+msgid "axleload (t)"
+msgstr ""
 
-msgid "Rotate left"
-msgstr "Περιστροφή αριστερά"
+msgid "Bookmark name"
+msgstr ""
 
-msgid "Rotate image left"
-msgstr "Περιστροφή εικόνας αριστερά"
+msgid "Bookmark name already exists!"
+msgstr ""
 
-msgid "Rotate right"
-msgstr "Περιστροφή δεξιά"
+msgid "Bookmark name must not contain ''{0}''!"
+msgstr ""
 
-msgid "Rotate image right"
-msgstr "Περιστροφή εικόνας δεξιά"
+msgid "Access class"
+msgstr ""
 
-msgid "WayPoint Image"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "Access types"
 msgstr ""
 
-msgid "Imported Images"
-msgstr "Εισαγμένες Εικόνες"
+msgid "Vehicle properties"
+msgstr ""
 
-msgid "Import vector graphics"
+msgid "Road requirements"
 msgstr ""
 
-msgid "Scale:"
-msgstr "Κλίμακα:"
+msgid "Max. incline up (%, pos.)"
+msgstr ""
 
-msgid "unit(s) = "
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Importing..."
-msgstr "Γίνεται εισαγωγή..."
-
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
+"Χειρότερος τύπος χωματόδρομου (1-5) προσπελάσιμο από όχημα, 0 απροσπέλαστο"
 
-msgid "Offset into background:"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "POWER"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Working Level"
-msgstr ""
+msgid "default"
+msgstr "προκαθορισμένο"
 
-msgid "Selects the working level."
+msgid "end nodes"
 msgstr ""
 
-msgid "Level Name"
-msgstr ""
+msgid "incline"
+msgstr "κλίση"
 
-msgid "Optional name-tag for a level."
+msgid "Ruleset:"
 msgstr ""
 
-msgid "The object preset you want to tag."
-msgstr ""
+msgid "Parameters:"
+msgstr "Παράμετροι:"
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Coloring:"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "Graphview"
 msgstr ""
 
-msgid "Fitting"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 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>"
+msgid "Ruleset"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "The lowest level of your building."
-msgstr ""
+msgid "Select directory"
+msgstr "Επιλέξτε κατάλογο"
 
-msgid "Highest Level"
-msgstr ""
+msgid "Vehicle"
+msgstr "Όχημα"
 
-msgid "The highest level of your building."
+msgid "Restore defaults"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
-msgstr ""
+msgid "Visualization"
+msgstr "Οπτικοποίηση"
 
-msgid "InfoMode"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "GPX info mode"
-msgstr ""
+msgid "Node color"
+msgstr "Χρώμα κόμβου"
 
-msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
-msgstr ""
+msgid "Arrow color"
+msgstr "Χρώμα βέλους"
 
-msgid "Delete this"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Delete this&older"
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "km/h"
-msgstr "χλμ/ω"
+msgid "New bookmark"
+msgstr ""
 
-msgid "Track name: "
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Bookmark deletion"
 msgstr ""
 
 msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "filtering ways"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "graphview default node"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "JunctionChecking"
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "junctions"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
+"ΟΙ βαθμονομήσεις χωματόδρομου πρέπει να δίνονται σαν ακέραιοι μεταξύ 0 και 5"
 
-msgid "seal Channel Digraph"
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Check "
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "Search "
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "Change Color"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Looking for shoreline..."
-msgstr "Αναζήτηση ακτογραμμής..."
-
-msgid "{0} nodes so far..."
-msgstr "{0} κόμβοι μέχρι τώρα..."
-
-msgid "Lake Walker."
-msgstr "Lake Walker."
-
-msgid "Lake Walker"
-msgstr "Lake Walker"
-
-msgid "Error creating cache directory: {0}"
-msgstr "Σφάλμα κατά την δημιουργία  καταλόγου cache: {0}"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
+msgstr ""
 
-msgid "Tracing"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "checking cache..."
-msgstr "έλεγχος cache..."
+msgid "Get Imagery Offset..."
+msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Removing duplicate nodes..."
-msgstr "Αφαίρεση διπλών κόμβων..."
+msgid "Loading imagery offsets..."
+msgstr ""
 
-msgid "Lakewalker trace"
-msgstr "Ίχνος Lakewalker"
+msgid "Error processing XML response: {0}"
+msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "Offset"
 msgstr ""
 
-msgid "east"
-msgstr "ανατολικά"
+msgid "Imagery Offset Database"
+msgstr ""
 
-msgid "northeast"
-msgstr "βορειοανατολικά"
+msgid "mm"
+msgstr ""
 
-msgid "north"
-msgstr "βόρεια"
+msgid "cm"
+msgstr ""
 
-msgid "northwest"
-msgstr "βορειοδυτικά"
+msgid "km"
+msgstr ""
 
-msgid "west"
-msgstr "δυτικά"
+msgid "Calibration geometries"
+msgstr ""
 
-msgid "southwest"
-msgstr "νοτιοδυτικά"
+msgid "Deprecated offsets"
+msgstr ""
 
-msgid "south"
-msgstr "νότια"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgstr ""
 
-msgid "southeast"
-msgstr "νοτιοανατολικά"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
+msgstr ""
 
-msgid "coastline"
-msgstr "ακτογραμμή"
+msgid "Deprecated by {0} on {1}"
+msgstr ""
 
-msgid "land"
-msgstr "γη"
+msgid "Created by {0} on {1}"
+msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Offset Information"
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
-msgstr "Μέγιστος αριθμός κόμβων στο αρχικό ίχνος"
+msgid "Report this offset"
+msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
-msgstr "Μέγιστη τιμή γκρίζου που να θεωρείται νερό (0-255)"
+msgid "You are to notify moderators of this offset. Why?"
+msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
-msgstr "Ακρίβεια απλοποίησης γραμμής (μοίρες)"
+msgid "Reporting the offset..."
+msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr "Ανάλυση πλακιδίων Landsat (pixel ανά μοίρα)"
+msgid "An imagery offset of {0}"
+msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
-msgstr "Μέγεθος πλακιδίων Landsat (pixels)"
+msgid "Imagery ID"
+msgstr ""
 
-msgid "Shift all traces to east (degrees)"
-msgstr "Μετατόπιση όλων των ιχνών ανατολικά (μοίρες)"
+msgid "A calibration geometry of {0} nodes"
+msgstr ""
 
-msgid "Shift all traces to north (degrees)"
-msgstr "Μετατόπιση όλων των ιχνών βόρεια (μοίρες)"
+msgid "Determined right here"
+msgstr ""
 
-msgid "Direction to search for land"
-msgstr "Κατεύθυνση για αναζήτηση ξηράς"
+msgid "Determined {0} away"
+msgstr ""
 
-msgid "Tag ways as"
-msgstr "Σήμανση διαδρομών ως"
+msgid "Reason"
+msgstr ""
 
-msgid "WMS Layer"
-msgstr "Επίπεδο WMS"
+msgid "This entry has been reported."
+msgstr ""
 
-msgid "Maximum cache size (MB)"
-msgstr "Μέγιστο μέγεθος cache (MB)"
+msgid "Server has rejected the request"
+msgstr ""
 
-msgid "Maximum cache age (days)"
-msgstr "Μέγιστη ηλικία cache (ημέρες)"
+msgid "Unable to connect to the server"
+msgstr ""
 
-msgid "Source text"
-msgstr "Πηγαίο κείμενο"
+msgid "Store Imagery Offset..."
+msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
-msgstr "Προτιμήσεις πρόσθετου Lakewalker"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
+msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Store calibration geometry"
 msgstr ""
-"Ένα πρόσθετο για ιχνηλάτηση όγκων νερού από υπόβαθρο εικόνων Landsat."
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Store imagery offset"
 msgstr ""
 
 msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
 msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
-"Ακρίβεια απλοποίησης γραμμών Douglas-Peucker , μετρημένη σε "
-"μοίρες.<br>Χαμηλότερες τιμές δίνουν περισσότερους κόμβους, και ποιό ακριβείς "
-"γραμμές. Default 0.0003."
 
 msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
-"Ανάλυση πλακιδίων Landsat, μετρημένη σε pixels ανά μοίρα. Προκαθορισμένη "
-"τιμή 4000."
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Uploading a new offset..."
 msgstr ""
-"Μέγεθος ενός πλακιδίου Landsat, μετρημένο σε pixels. Προκαθορισμένη τιμή "
-"2000."
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
-"Μετατόπιση όλων των σημείων Ανατολικά (μοίρες). Προκαθορισμένη τιμή 0."
 
-msgid "Offset all points in North direction (degrees). Default 0."
-msgstr "Μετατόπιση όλων των σημείων Βόρεια (μοίρες). Προκαθορισμένη τιμή 0."
-
-msgid "Direction to search for land. Default east."
-msgstr "Κατεύθυνση για αναζήτηση ξηράς. Προκαθορισμένη τιμή ανατολικά."
+msgid "Adjust imagery"
+msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
-"Σήμανση διαδρομών ως νερό, ακτογραμμή, έδαφος ή τίποτα. Προεπιλογή είναι το "
-"νερό."
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Start adjusting"
 msgstr ""
-"Μέγιστο μέγεθος κάθε καταλόγου cache σε bytes. Προκαθορισμένη τιμή 300MB"
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Downloading image tile..."
-msgstr "Λήψη πλακιδίου εικόνας..."
+msgid "Normal"
+msgstr "Κανονική"
 
-msgid "Could not acquire image"
+msgid "Rotate 90"
+msgstr "Περιστροφή 90"
+
+msgid "Rotate 180"
+msgstr "Περιστροφή 180"
+
+msgid "Rotate 270"
+msgstr "Περιστροφή 270"
+
+msgid "Previous image"
+msgstr "Προηγούμενη εικόνα"
+
+msgid "Next image"
+msgstr "Επόμενη εικόνα"
+
+msgid "Rotate left"
+msgstr "Περιστροφή αριστερά"
+
+msgid "Rotate image left"
+msgstr "Περιστροφή εικόνας αριστερά"
+
+msgid "Rotate right"
+msgstr "Περιστροφή δεξιά"
+
+msgid "Rotate image right"
+msgstr "Περιστροφή εικόνας δεξιά"
+
+msgid "WayPoint Image"
 msgstr ""
 
-msgid "Connection Failed"
-msgstr "Η σύνδεση απέτυχε"
+msgid "Display non-geotagged photos"
+msgstr ""
 
-msgid "Not connected"
-msgstr "Χωρίς σύνδεση"
+msgid "Imported Images"
+msgstr "Εισαγμένες Εικόνες"
 
-msgid "Connecting"
-msgstr "Γίνεται σύνδεση"
+msgid "Import vector graphics"
+msgstr ""
 
-msgid "Connected"
-msgstr "Σε σύνδεση"
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
 
-msgid "no name"
-msgstr "χωρίς όνομα"
+msgid "Concourse wizard ..."
+msgstr ""
 
-msgid "Live GPS"
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Show GPS data."
-msgstr "Εμφάνιση δεδομένων GPS."
+msgid "Vertical layer:"
+msgstr ""
 
-msgid "Status"
-msgstr "Κατάσταση"
+msgid "Structure type:"
+msgstr ""
 
-msgid "Way Info"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Speed"
-msgstr "Ταχύτητα"
+msgid "Indoor Mapping Helper"
+msgstr ""
 
-msgid "Course"
-msgstr "Πορεία"
+msgid "POWER"
+msgstr ""
 
-msgid "LiveGPS layer"
-msgstr "Επίπεδο LiveGPS"
+msgid "Activates the plug-in"
+msgstr ""
 
-msgid "Capture GPS Track"
-msgstr "Καταγραφή ίχνους GPS"
+msgid "Working Level"
+msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "Selects the working level."
 msgstr ""
-"Σύνδεση στον διακομιστή gpsd και εμφάνιση της τρέχουσας θέσης στο επίπεδο "
-"LiveGPS."
 
-msgid "Center Once"
-msgstr "Κεντράρισμα μία φορά"
+msgid "Level Name"
+msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
-msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση."
+msgid "Optional name-tag for a level."
+msgstr ""
 
-msgid "Auto-Center"
-msgstr "Αυτόματο Κεντράρισμα"
+msgid "The object preset you want to tag."
+msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
-msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση συνεχώς."
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
 
-msgid "Open MapDust"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "Fitting"
 msgstr ""
 
-msgid "Missing input data"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "Total images:"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "images"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Mapillary"
+msgid "InfoMode"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "Delete this"
 msgstr ""
 
-msgid "Export pictures"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Export Mapillary pictures"
-msgstr ""
+msgid "km/h"
+msgstr "χλμ/ω"
 
-msgid "Export images"
+msgid "Track name: "
 msgstr ""
 
-msgid "Import pictures"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Import local pictures"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "Select pictures"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Join mode"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Upload pictures."
+msgid "junctions"
 msgstr ""
 
-msgid "Walk mode"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Copy key"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Check "
 msgstr ""
 
-msgid "Edit on website"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Search "
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Submit"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Export all images"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Explore"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Select a directory"
+msgid "Correct"
 msgstr ""
 
-msgid "Speed limit"
+msgid "Wrong"
 msgstr ""
 
-msgid "Give way"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "No entry"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Intersection danger"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Uneven road"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "No parking"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "No overtaking"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "No turn"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Years"
+msgid "Replace way"
 msgstr ""
 
-msgid "Months"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Days"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Αντικατάσταση Γεωμετρίας"
 
-msgid "Imported images"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Not older than: "
-msgstr ""
+msgid "Looking for shoreline..."
+msgstr "Αναζήτηση ακτογραμμής..."
 
-msgid "Downloaded images"
-msgstr ""
+msgid "{0} nodes so far..."
+msgstr "{0} κόμβοι μέχρι τώρα..."
 
-msgid "Only images with signs"
-msgstr ""
+msgid "Lake Walker."
+msgstr "Lake Walker."
 
-msgid "Choose signs"
-msgstr ""
+msgid "Lake Walker"
+msgstr "Lake Walker"
 
-msgid "Mapillary history"
-msgstr ""
+msgid "Error creating cache directory: {0}"
+msgstr "Σφάλμα κατά την δημιουργία  καταλόγου cache: {0}"
 
-msgid "Open Mapillary history dialog"
+msgid "Tracing"
 msgstr ""
 
-msgid "Mapillary picture"
-msgstr ""
+msgid "checking cache..."
+msgstr "έλεγχος cache..."
 
-msgid "Open Mapillary window"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Open Mapillary main dialog"
-msgstr ""
+msgid "Removing duplicate nodes..."
+msgstr "Αφαίρεση διπλών κόμβων..."
 
-msgid "Next picture"
-msgstr ""
+msgid "Lakewalker trace"
+msgstr "Ίχνος Lakewalker"
 
-msgid "Shows the next picture in the sequence"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Previous picture"
-msgstr ""
+msgid "east"
+msgstr "ανατολικά"
 
-msgid "Shows the previous picture in the sequence"
-msgstr ""
+msgid "northeast"
+msgstr "βορειοανατολικά"
 
-msgid "Jump to red"
-msgstr ""
+msgid "north"
+msgstr "βόρεια"
 
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
+msgid "northwest"
+msgstr "βορειοδυτικά"
 
-msgid "Jump to blue"
-msgstr ""
+msgid "west"
+msgstr "δυτικά"
 
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
+msgid "southwest"
+msgstr "νοτιοδυτικά"
 
-msgid "Stops the walk."
-msgstr ""
+msgid "south"
+msgstr "νότια"
 
-msgid "Play"
-msgstr ""
+msgid "southeast"
+msgstr "νοτιοανατολικά"
 
-msgid "Continues with the paused walk."
-msgstr ""
+msgid "coastline"
+msgstr "ακτογραμμή"
 
-msgid "Pause"
+msgid "land"
+msgstr "γη"
+
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Maximum number of nodes in initial trace"
+msgstr "Μέγιστος αριθμός κόμβων στο αρχικό ίχνος"
+
+msgid "Maximum gray value to count as water (0-255)"
+msgstr "Μέγιστη τιμή γκρίζου που να θεωρείται νερό (0-255)"
+
+msgid "Line simplification accuracy (degrees)"
+msgstr "Ακρίβεια απλοποίησης γραμμής (μοίρες)"
+
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr "Ανάλυση πλακιδίων Landsat (pixel ανά μοίρα)"
+
+msgid "Size of Landsat tiles (pixels)"
+msgstr "Μέγεθος πλακιδίων Landsat (pixels)"
+
+msgid "Shift all traces to east (degrees)"
+msgstr "Μετατόπιση όλων των ιχνών ανατολικά (μοίρες)"
+
+msgid "Shift all traces to north (degrees)"
+msgstr "Μετατόπιση όλων των ιχνών βόρεια (μοίρες)"
+
+msgid "Direction to search for land"
+msgstr "Κατεύθυνση για αναζήτηση ξηράς"
+
+msgid "Tag ways as"
+msgstr "Σήμανση διαδρομών ως"
+
+msgid "WMS Layer"
+msgstr "Επίπεδο WMS"
+
+msgid "Maximum cache size (MB)"
+msgstr "Μέγιστο μέγεθος cache (MB)"
+
+msgid "Maximum cache age (days)"
+msgstr "Μέγιστη ηλικία cache (ημέρες)"
+
+msgid "Source text"
+msgstr "Πηγαίο κείμενο"
+
+msgid "Lakewalker Plugin Preferences"
+msgstr "Προτιμήσεις πρόσθετου Lakewalker"
+
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
+"Ένα πρόσθετο για ιχνηλάτηση όγκων νερού από υπόβαθρο εικόνων Landsat."
 
-msgid "Display hour when the picture was taken"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
+"Ακρίβεια απλοποίησης γραμμών Douglas-Peucker , μετρημένη σε "
+"μοίρες.<br>Χαμηλότερες τιμές δίνουν περισσότερους κόμβους, και ποιό ακριβείς "
+"γραμμές. Default 0.0003."
 
-msgid "Download mode"
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
+"Ανάλυση πλακιδίων Landsat, μετρημένη σε pixels ανά μοίρα. Προκαθορισμένη "
+"τιμή 4000."
 
-msgid "You are logged in as ''{0}''."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
+"Μέγεθος ενός πλακιδίου Landsat, μετρημένο σε pixels. Προκαθορισμένη τιμή "
+"2000."
 
-msgid "You are currently not logged in."
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
+"Μετατόπιση όλων των σημείων Ανατολικά (μοίρες). Προκαθορισμένη τιμή 0."
 
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
+msgid "Offset all points in North direction (degrees). Default 0."
+msgstr "Μετατόπιση όλων των σημείων Βόρεια (μοίρες). Προκαθορισμένη τιμή 0."
 
-msgid "Upload selected sequence"
-msgstr ""
+msgid "Direction to search for land. Default east."
+msgstr "Κατεύθυνση για αναζήτηση ξηράς. Προκαθορισμένη τιμή ανατολικά."
 
-msgid "Delete after upload"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
+"Σήμανση διαδρομών ως νερό, ακτογραμμή, έδαφος ή τίποτα. Προεπιλογή είναι το "
+"νερό."
 
-msgid "Wait for full quality pictures"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
+"Μέγιστο μέγεθος κάθε καταλόγου cache σε bytes. Προκαθορισμένη τιμή 300MB"
 
-msgid "Go forward"
+msgid "Maximum age of each cached file in days. Default is 100"
 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"
+msgid "Data source text. Default is Landsat."
 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 "Downloading image tile..."
+msgstr "Λήψη πλακιδίου εικόνας..."
 
-msgid "2 images unjoined"
+msgid "Could not acquire image"
 msgstr ""
 
-msgid "everything in the visible area"
-msgstr ""
+msgid "Connection Failed"
+msgstr "Η σύνδεση απέτυχε"
 
-msgid "areas with downloaded OSM-data"
-msgstr ""
+msgid "Not connected"
+msgstr "Χωρίς σύνδεση"
 
-msgid "only when manually requested"
-msgstr ""
+msgid "Connecting"
+msgstr "Γίνεται σύνδεση"
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
+msgid "Connected"
+msgstr "Σε σύνδεση"
 
-msgid "Downloading"
-msgstr ""
+msgid "no name"
+msgstr "χωρίς όνομα"
 
-msgid "Select mode"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Mapillary login"
-msgstr ""
+msgid "Show GPS data."
+msgstr "Εμφάνιση δεδομένων GPS."
 
-msgid "Login successful, return to JOSM."
-msgstr ""
+msgid "Status"
+msgstr "Κατάσταση"
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Way Info"
 msgstr ""
 
-msgid "Downloading Mapillary images"
-msgstr ""
+msgid "Speed"
+msgstr "Ταχύτητα"
 
-msgid "Total Mapillary images: {0}"
-msgstr ""
+msgid "Course"
+msgstr "Πορεία"
 
-msgid "Submitting Mapillary Changeset"
-msgstr ""
+msgid "LiveGPS layer"
+msgstr "Επίπεδο LiveGPS"
 
-msgid "No images found"
-msgstr ""
+msgid "Capture GPS Track"
+msgstr "Καταγραφή ίχνους GPS"
 
-msgid "Finished upload"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
+"Σύνδεση στον διακομιστή gpsd και εμφάνιση της τρέχουσας θέσης στο επίπεδο "
+"LiveGPS."
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
+msgid "Center Once"
+msgstr "Κεντράρισμα μία φορά"
 
-msgid "Not Logged in to Mapillary"
-msgstr ""
+msgid "Center the LiveGPS layer to current position."
+msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση."
 
-msgid "Uploading: {0}"
-msgstr ""
+msgid "Auto-Center"
+msgstr "Αυτόματο Κεντράρισμα"
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση συνεχώς."
+
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -30054,6 +30196,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -30151,9 +30296,6 @@ msgstr ""
 msgid "Join"
 msgstr "Σύνδεση"
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -31166,6 +31308,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31613,6 +31815,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Εμπρός"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Πίσω"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32481,9 +32761,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Αντικατάσταση Γεωμετρίας"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32681,15 +32958,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr "Πίσω"
-
 msgid "jumps n sec back"
 msgstr "μεταπήδηση n δευ πίσω"
 
-msgid "Forward"
-msgstr "Εμπρός"
-
 msgid "jumps n sec forward"
 msgstr "μεταπήδηση n δευ μπροστά"
 
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 5dd5b7b..5268155 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2015-06-08 12:52+0000\n"
 "Last-Translator: Mark Pulley <mrpulley at lizzy.com.au>\n"
 "Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:46+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:16+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -211,18 +211,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Add imagery layer {0}"
 
-msgid "Error"
-msgstr "Error"
-
-msgid "Select image format for WMS layer"
-msgstr "Select image format for WMS layer"
-
-msgid "Select WMS layers"
-msgstr "Select WMS layers"
-
-msgid "Add layers"
-msgstr "Add layers"
-
 msgid "Invalid service URL."
 msgstr "Invalid service URL."
 
@@ -235,6 +223,18 @@ msgstr "Could not retrieve WMS layer list."
 msgid "Could not parse WMS layer list."
 msgstr "Could not parse WMS layer list."
 
+msgid "Error"
+msgstr "Error"
+
+msgid "Select image format for WMS layer"
+msgstr "Select image format for WMS layer"
+
+msgid "Select WMS layers"
+msgstr "Select WMS layers"
+
+msgid "Add layers"
+msgstr "Add layers"
+
 msgid "Add Node..."
 msgstr "Add Node..."
 
@@ -3511,9 +3511,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3938,12 +3935,12 @@ msgstr "Multiple associatedStreet relations"
 msgid "House number without street"
 msgstr "House number without street"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "House number ''{0}'' duplicated"
-
 msgid "Duplicate house numbers"
 msgstr "Duplicate house numbers"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "House number ''{0}'' duplicated"
+
 msgid "Multiple street names in relation"
 msgstr "Multiple street names in relation"
 
@@ -3979,6 +3976,9 @@ msgstr "Coastlines"
 msgid "This test checks that coastlines are correct."
 msgstr "This test checks that coastlines are correct."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Reversed coastline: land not on left side"
+
 msgid "Unconnected coastline"
 msgstr "Unconnected coastline"
 
@@ -3988,6 +3988,9 @@ msgstr "Unordered coastline"
 msgid "Reversed coastline"
 msgstr "Reversed coastline"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "Conditional Keys"
 
@@ -4024,6 +4027,12 @@ msgstr "Crossing boundaries"
 msgid "Crossing barriers"
 msgstr "Crossing barriers"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4252,6 +4261,12 @@ msgstr "No useful role for multipolygon member"
 msgid "Non-Way in multipolygon"
 msgstr "Non-Way in multipolygon"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Missing name:* translation"
 
@@ -4474,30 +4489,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Property values contain HTML entity"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr "Presets do not contain property key"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Key ''{0}'' not in presets."
 
 msgid "Misspelled property value"
 msgstr "Misspelt property value"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Presets do not contain property value"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Value ''{0}'' for key ''{1}'' not in presets."
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4742,9 +4757,6 @@ msgstr "Wrongly Ordered Ways"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "This test checks the direction of water, land and coastline ways."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Reversed coastline: land not on left side"
-
 msgid "Reversed land: land not on left side"
 msgstr "Reversed land: land not on left side"
 
@@ -5293,9 +5305,6 @@ msgstr "The geographic longitude at the mouse pointer."
 msgid "System of measurement changed to {0}"
 msgstr "System of measurement changed to {0}"
 
-msgid "Layer not in list."
-msgstr "layer not in list."
-
 msgid "Default (open, closed, new)"
 msgstr "Default (open, closed, new)"
 
@@ -6803,6 +6812,9 @@ msgstr "Sort notes"
 msgid "Sort"
 msgstr "Sort"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Object type:"
 
@@ -7046,6 +7058,14 @@ msgstr "Download changeset content"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Download the content of the selected changesets from the server"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "My changesets"
 
@@ -8412,9 +8432,6 @@ msgstr "Enter a place name to search for"
 msgid "Areas around places"
 msgstr "Areas around places"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer exception, possibly some missing tags."
-
 msgid "Search ..."
 msgstr "Search ..."
 
@@ -9040,6 +9057,9 @@ msgstr "Unsaved changes - Save/Upload before exiting?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Unsaved changes - Save/Upload before deleting?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Uploading and saving modified layers ..."
 
@@ -9106,6 +9126,12 @@ msgstr "Exit now!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Exit JOSM without saving. Unsaved changes are lost."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Delete now!"
 
@@ -9118,6 +9144,12 @@ msgstr "Perform actions before exiting"
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Perform actions before deleting"
 
@@ -11372,6 +11404,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
@@ -13528,6 +13563,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "NMEA import failure!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Null pointer exception, possibly some missing tags."
+
 msgid "Note Files"
 msgstr ""
 
@@ -13905,6 +13943,9 @@ msgstr "Uploading data ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Unexpected id 0 for osm primitive found"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -15632,6 +15673,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15743,7 +15787,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15922,6 +15969,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16216,18 +16266,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -16237,6 +16275,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -16369,6 +16410,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -16741,6 +16785,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16861,6 +16908,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Helps vectorising WMS images."
 
@@ -17071,6 +17121,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17095,6 +17150,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17255,6 +17313,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -18575,6 +18637,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Ford"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Ways"
 
@@ -20194,6 +20259,9 @@ msgstr "Runway"
 msgid "Taxiway"
 msgstr "Taxiway"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Helipad"
 
@@ -20864,11 +20932,11 @@ msgstr "Point Number"
 msgid "Point Name"
 msgstr "Point Name"
 
-msgid "Phone Number"
-msgstr "Phone Number"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -20882,6 +20950,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Phone Number"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -21751,6 +21825,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -21835,6 +21913,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -24040,7 +24122,13 @@ msgstr "Nature Reserve"
 msgid "Scree"
 msgstr "Scree"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -24707,16 +24795,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -24725,18 +24807,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24749,18 +24819,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24953,9 +25011,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24965,6 +25034,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24980,39 +25055,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25031,9 +25091,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -25088,10 +25157,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -25107,7 +25182,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25152,7 +25227,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -25186,6 +25261,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -25204,6 +25282,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -25294,10 +25375,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -25547,6 +25631,27 @@ msgstr "Uploading GPX Track"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Uploads traces to openstreetmap.org"
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25885,6 +25990,403 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
+msgid "Mapillary Images"
+msgstr ""
+
+msgid "Mapillary layer"
+msgstr ""
+
+msgid "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr ""
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr ""
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr ""
 
@@ -27585,9 +28087,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Login"
-msgstr ""
-
 msgid "Enable autologin"
 msgstr ""
 
@@ -27620,9 +28119,6 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Logout"
-msgstr ""
-
 msgid "Clear log"
 msgstr ""
 
@@ -28171,9 +28667,6 @@ msgstr ""
 msgid "cm"
 msgstr ""
 
-msgid "m"
-msgstr ""
-
 msgid "km"
 msgstr ""
 
@@ -28343,21 +28836,9 @@ msgstr "Imported Images"
 msgid "Import vector graphics"
 msgstr ""
 
-msgid "Scale:"
-msgstr ""
-
-msgid "unit(s) = "
-msgstr ""
-
-msgid "Importing..."
-msgstr ""
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -28562,6 +29043,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr ""
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -28814,400 +29350,6 @@ msgstr ""
 msgid "Missing input data"
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Measured values"
 
@@ -30674,6 +30816,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "rail"
 
@@ -30769,9 +30914,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -31788,6 +31930,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terrace"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -32235,6 +32437,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -33061,9 +33341,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -33257,15 +33534,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 02232ae..b27320f 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:50+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:18+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -206,28 +206,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3284,9 +3284,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3688,10 +3685,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3728,6 +3725,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3737,6 +3737,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3773,6 +3776,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3991,6 +4000,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4201,30 +4216,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4468,9 +4483,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4991,9 +5003,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6413,6 +6422,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Object type:"
 
@@ -6652,6 +6664,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7924,9 +7944,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8490,6 +8507,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8541,6 +8561,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8553,6 +8579,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10606,6 +10638,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12687,6 +12722,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13049,6 +13087,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14692,6 +14733,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14803,7 +14847,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14982,6 +15029,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15276,18 +15326,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15297,6 +15335,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15429,6 +15470,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15796,6 +15840,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15910,6 +15957,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16107,6 +16157,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16129,6 +16184,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16285,6 +16343,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17605,6 +17667,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19224,6 +19289,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19894,10 +19962,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19912,6 +19980,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20781,6 +20855,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20865,6 +20943,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23070,7 +23152,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23737,16 +23825,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23755,18 +23837,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23779,18 +23849,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23983,9 +24041,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23995,6 +24064,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24010,39 +24085,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24061,9 +24121,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24118,10 +24187,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24137,7 +24212,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24182,7 +24257,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24216,6 +24291,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24234,6 +24312,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24324,10 +24405,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24573,6 +24657,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24911,3267 +25016,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29633,6 +29775,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29728,9 +29873,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30742,6 +30884,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31189,6 +31391,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32015,9 +32295,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32211,15 +32488,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index fac82d3..6c69efe 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,16 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-17 12:49+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-01 11:03+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: German <josm-dev at openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:45+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:15+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: de\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -214,18 +214,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Add imagery layer {0}"
 
-msgid "Error"
-msgstr "Error"
-
-msgid "Select image format for WMS layer"
-msgstr "Select image format for WMS layer"
-
-msgid "Select WMS layers"
-msgstr "Select WMS layers"
-
-msgid "Add layers"
-msgstr "Add layers"
-
 msgid "Invalid service URL."
 msgstr "Invalid service URL."
 
@@ -238,6 +226,18 @@ msgstr "Could not retrieve WMS layer list."
 msgid "Could not parse WMS layer list."
 msgstr "Could not parse WMS layer list."
 
+msgid "Error"
+msgstr "Error"
+
+msgid "Select image format for WMS layer"
+msgstr "Select image format for WMS layer"
+
+msgid "Select WMS layers"
+msgstr "Select WMS layers"
+
+msgid "Add layers"
+msgstr "Add layers"
+
 msgid "Add Node..."
 msgstr "Add Node..."
 
@@ -3520,9 +3520,6 @@ msgstr "Matrix set identifier"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "No layers defined by getCapabilities document: {0}"
 
-msgid "No layer selected"
-msgstr "No layer selected"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3950,12 +3947,12 @@ msgstr "Multiple associatedStreet relations"
 msgid "House number without street"
 msgstr "House number without street"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "House number ''{0}'' duplicated"
-
 msgid "Duplicate house numbers"
 msgstr "Duplicate house numbers"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "House number ''{0}'' duplicated"
+
 msgid "Multiple street names in relation"
 msgstr "Multiple street names in relation"
 
@@ -3991,6 +3988,9 @@ msgstr "Coastlines"
 msgid "This test checks that coastlines are correct."
 msgstr "This test checks that coastlines are correct."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Reversed coastline: land not on left side"
+
 msgid "Unconnected coastline"
 msgstr "Unconnected coastline"
 
@@ -4000,6 +4000,9 @@ msgstr "Unordered coastline"
 msgid "Reversed coastline"
 msgstr "Reversed coastline"
 
+msgid "invalid coastline"
+msgstr "invalid coastline"
+
 msgid "Conditional Keys"
 msgstr "Conditional Keys"
 
@@ -4036,6 +4039,12 @@ msgstr "Crossing boundaries"
 msgid "Crossing barriers"
 msgstr "Crossing barriers"
 
+msgid "Self crossing"
+msgstr "Self crossing"
+
+msgid "Self-crossing ways"
+msgstr "Self-crossing ways"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4266,6 +4275,12 @@ msgstr "No useful role for multipolygon member"
 msgid "Non-Way in multipolygon"
 msgstr "Non-Way in multipolygon"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr "Multipolygon member(s) repeated with different role"
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr "Multipolygon member(s) repeated with same role"
+
 msgid "Missing name:* translation"
 msgstr "Missing name:* translation"
 
@@ -4488,30 +4503,30 @@ msgstr "Property values contain multiple white spaces"
 msgid "Property values contain HTML entity"
 msgstr "Property values contain HTML entity"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Key ''{0}'' looks like ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Misspelled property key"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Key ''{0}'' looks like ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Presets do not contain property key"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Key ''{0}'' not in presets."
 
 msgid "Misspelled property value"
 msgstr "Misspelled property value"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Presets do not contain property value"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Value ''{0}'' for key ''{1}'' not in presets."
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4756,9 +4771,6 @@ msgstr "Wrongly Ordered Ways"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "This test checks the direction of water, land and coastline ways."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Reversed coastline: land not on left side"
-
 msgid "Reversed land: land not on left side"
 msgstr "Reversed land: land not on left side"
 
@@ -5023,7 +5035,7 @@ msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
 msgid "Log level is at {0} ({1}, {2})"
-msgstr ""
+msgstr "Log level is at {0} ({1}, {2})"
 
 msgid "Plugin loading skipped"
 msgstr "Plugin loading skipped"
@@ -5308,9 +5320,6 @@ msgstr "The geographic longitude at the mouse pointer."
 msgid "System of measurement changed to {0}"
 msgstr "System of measurement changed to {0}"
 
-msgid "Layer not in list."
-msgstr "layer not in list."
-
 msgid "Default (open, closed, new)"
 msgstr "Default (open, closed, new)"
 
@@ -6834,6 +6843,9 @@ msgstr "Sort notes"
 msgid "Sort"
 msgstr "Sort"
 
+msgid "Open the note in an external browser"
+msgstr "Open the note in an external browser"
+
 msgid "Object type:"
 msgstr "Object type:"
 
@@ -7079,6 +7091,16 @@ msgstr "Download changeset content"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Download the content of the selected changesets from the server"
 
+msgid "Download changed objects"
+msgstr "Download changed objects"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+
 msgid "My changesets"
 msgstr "My changesets"
 
@@ -8450,9 +8472,6 @@ msgstr "Enter a place name to search for"
 msgid "Areas around places"
 msgstr "Areas around places"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer exception, possibly some missing tags."
-
 msgid "Search ..."
 msgstr "Search ..."
 
@@ -9080,6 +9099,9 @@ msgstr "Unsaved changes - Save/Upload before exiting?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Unsaved changes - Save/Upload before deleting?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "Unsaved changes - Save/Upload before restarting?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Uploading and saving modified layers ..."
 
@@ -9146,6 +9168,12 @@ msgstr "Exit now!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Exit JOSM without saving. Unsaved changes are lost."
 
+msgid "Restart now!"
+msgstr "Restart now!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr "Restart JOSM without saving. Unsaved changes are lost."
+
 msgid "Delete now!"
 msgstr "Delete now!"
 
@@ -9158,6 +9186,12 @@ msgstr "Perform actions before exiting"
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 
+msgid "Perform actions before restarting"
+msgstr "Perform actions before restarting"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Perform actions before deleting"
 
@@ -11427,6 +11461,9 @@ msgstr "Draw oneway arrows."
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
@@ -13677,6 +13714,9 @@ msgstr "NMEA import success:"
 msgid "NMEA import failure!"
 msgstr "NMEA import failure!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Null pointer exception, possibly some missing tags."
+
 msgid "Note Files"
 msgstr "Note Files"
 
@@ -14062,6 +14102,9 @@ msgstr "Uploading data ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Unexpected id 0 for osm primitive found"
 
+msgid "Failed to evaluate {0}"
+msgstr "Failed to evaluate {0}"
+
 msgid "Downloading data..."
 msgstr "Downloading data..."
 
@@ -15444,7 +15487,7 @@ msgid "JOSM is up to date."
 msgstr "JOSM is up to date."
 
 msgid "JOSM is out of date. The current version is {0}. Try updating JOSM."
-msgstr ""
+msgstr "JOSM is out of date. The current version is {0}. Try updating JOSM."
 
 msgid ""
 "Before you file a bug report make sure you have updated to the latest "
@@ -15949,6 +15992,9 @@ msgstr "Tiris: DGM (Terrain model)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Surface model)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -16060,8 +16106,11 @@ msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16194,7 +16243,7 @@ msgid "Berlin aerial photograph 2015"
 msgstr "Berlin aerial photograph 2015"
 
 msgid "Berlin aerial photograph 2016"
-msgstr ""
+msgstr "Berlin aerial photograph 2016"
 
 msgid "Stuttgart (aerial imagery)"
 msgstr "Stuttgart (aerial imagery)"
@@ -16206,7 +16255,7 @@ msgid "Erlangen aerial imagery (2013 6.25 cm)"
 msgstr "Erlangen aerial imagery (2013 6.25 cm)"
 
 msgid "Erlangen aerial imagery (2011 5.0 cm)"
-msgstr ""
+msgstr "Erlangen aerial imagery (2011 5.0 cm)"
 
 msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
 msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
@@ -16241,6 +16290,9 @@ msgstr "Drone Imagery 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drone Imagery Canaan(Haiti) November 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortophoto 2000"
 
@@ -16535,18 +16587,6 @@ msgstr "Freemap.sk Cyclo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Ski"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakia Historic Maps"
 
@@ -16556,6 +16596,9 @@ msgstr "RABA-KGZ: Slovenia farmland use"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slovenia built-up areas"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "City of Cape Town 2015 Aerial"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
@@ -16602,7 +16645,7 @@ msgid "Stadt Zürich Luftbild 2011"
 msgstr "Stadt Zürich Luftbild 2011"
 
 msgid "Aerial imagery canton Solothurn RGB (SOGIS 2013/2014/2015)"
-msgstr ""
+msgstr "Aerial imagery canton Solothurn RGB (SOGIS 2013/2014/2015)"
 
 msgid "Aerial imagery canton Solothurn Infrared (SOGIS 2013/2014/2015)"
 msgstr ""
@@ -16688,6 +16731,9 @@ msgstr "U.S. Forest Service roads"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -17081,6 +17127,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Downloads OSM data along a way"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17223,6 +17272,9 @@ msgstr ""
 "creates a channel digraph and checks a subset of channels if it is a "
 "junction or searches in a subset of channels for junctions"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Helps vectorising WMS images."
 
@@ -17465,6 +17517,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17495,6 +17552,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin to digitally sign OSM-Data"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17662,6 +17722,10 @@ msgid "No wheeled vehicle"
 msgstr "No wheeled vehicle"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "pitch"
 
@@ -18990,6 +19054,9 @@ msgstr "construction"
 msgid "Ford"
 msgstr "Ford"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Ways"
 
@@ -20628,6 +20695,9 @@ msgstr "Runway"
 msgid "Taxiway"
 msgstr "Taxiway"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Helipad"
 
@@ -21299,11 +21369,11 @@ msgstr "Point Number"
 msgid "Point Name"
 msgstr "Point Name"
 
-msgid "Phone Number"
-msgstr "Phone number"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -21317,6 +21387,12 @@ msgstr "Ambulance Station"
 msgid "Automated Defibrillator"
 msgstr "Automated Defibrillator"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Phone number"
+
 msgid "Located inside a building?"
 msgstr "Located inside a building?"
 
@@ -22186,6 +22262,10 @@ msgid "university"
 msgstr "university"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "hospital"
 
@@ -22270,6 +22350,10 @@ msgid "public"
 msgstr "public"
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Levels"
 
@@ -24483,8 +24567,14 @@ msgstr "Nature Reserve"
 msgid "Scree"
 msgstr "Scree"
 
-msgid "An accumulation of loose rocks."
-msgstr "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "Fell"
@@ -25166,17 +25256,11 @@ msgstr "Routes"
 msgid "Bicycle Route"
 msgstr "Bicycle Route"
 
-msgid "icn"
-msgstr "icn"
-
-msgid "ncn"
-msgstr "ncn"
-
-msgid "rcn"
-msgstr "rcn"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "lcn"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Mountain Biking Route"
@@ -25184,18 +25268,6 @@ msgstr "Mountain Biking Route"
 msgid "Hiking Route"
 msgstr "Hiking Route"
 
-msgid "iwn"
-msgstr "iwn"
-
-msgid "nwn"
-msgstr "nwn"
-
-msgid "rwn"
-msgstr "rwn"
-
-msgid "lwn"
-msgstr "lwn"
-
 msgid "infrastructure"
 msgstr "infrastructure"
 
@@ -25208,18 +25280,6 @@ msgstr "Walking Route"
 msgid "Riding Route"
 msgstr "Riding Route"
 
-msgid "ihn"
-msgstr "ihn"
-
-msgid "nhn"
-msgstr "nhn"
-
-msgid "rhn"
-msgstr "rhn"
-
-msgid "lhn"
-msgstr "lhn"
-
 msgid "Piste Route"
 msgstr "Piste Route"
 
@@ -25412,9 +25472,20 @@ msgstr "Odd housenumber in even address interpolation."
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr "Way with {0}. Tag each housenumber separately if possible."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr "Same value of {0} and {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} without {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} without {1} or {2}"
 
@@ -25424,6 +25495,12 @@ msgstr "{0} without {1}, {2} or {3}"
 msgid "{0} together with {1}"
 msgstr "{0} together with {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "incomplete object: only {0}"
 
@@ -25439,39 +25516,24 @@ msgstr "{0} together with {1} and conflicting values"
 msgid "{0} on suspicious object"
 msgstr "{0} on suspicious object"
 
-msgid "restaurant without name"
-msgstr "restaurant without name"
-
-msgid "{0} used with {1}"
-msgstr "{0} used with {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "natural water used for swimming pool"
 
 msgid "sport without physical feature"
 msgstr "sport without physical feature"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} should be on the node where {1} and {2} intersect"
-
 msgid "alternative name without {0}"
 msgstr "alternative name without {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "incomplete usage of {0} on a way without {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Same value of {0} and {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Same value of {0}, {1} and {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} and {1} together with {2} and conflicting values"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Suspicious tag combination: {0} and {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} on a relation without {1}"
 
@@ -25496,9 +25558,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} together with {1} and {2}. Remove {1} and {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} is deprecated"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 
@@ -25565,11 +25636,17 @@ msgstr "Unspecific tag {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Definition of {0} is unclear"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "key with uncommon character"
 
@@ -25585,8 +25662,8 @@ msgstr "{0} is deprecated for {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} is deprecated. Use the {1}: key prefix instead."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
+msgstr ""
 
 msgid "The key {0} has an uncommon value."
 msgstr "The key {0} has an uncommon value."
@@ -25630,8 +25707,8 @@ msgstr "Overlapping identical natural areas"
 msgid "Overlapping Identical Landuses"
 msgstr "Overlapping identical landuses"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "node connects waterway and bridge"
@@ -25668,6 +25745,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Coastline inside {1}"
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} should be on the node where {1} and {2} intersect"
+
 msgid "abbreviated street name"
 msgstr "abbreviated street name"
 
@@ -25686,6 +25766,9 @@ msgstr "highway without a reference"
 msgid "temporary highway type"
 msgstr "temporary highway type"
 
+msgid "{0} used with {1}"
+msgstr "{0} used with {1}"
+
 msgid "street name contains ss"
 msgstr "street name contains ss"
 
@@ -25782,11 +25865,14 @@ msgstr "unknown jewish denomination"
 msgid "{0} is unnecessary"
 msgstr "{0} is unnecessary"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} is unnecessary for {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} makes no sense"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Nodes duplicating parent way tags"
@@ -26043,6 +26129,27 @@ msgstr "Uploading GPX Track"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Uploads traces to openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importing..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "Please open or create data layer before importing"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Scale:"
+
+msgid "unit(s) = "
+msgstr "unit(s) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Shows elevation profile"
 
@@ -26395,6 +26502,403 @@ 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 "Total images:"
+msgstr "Total images:"
+
+msgid "images"
+msgstr "images"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "Traffic sign font at ''{0}'' has wrong format"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Could not read font-file from ''{0}''"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Create Mapillary layer"
+
+msgid "Start Mapillary layer"
+msgstr "Start Mapillary layer"
+
+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 "Select pictures"
+msgstr "Select pictures"
+
+msgid "Import pictures into sequence"
+msgstr "Import pictures into sequence"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Import pictures into Mapillary layer in a sequence"
+
+msgid "Join mode"
+msgstr "Join mode"
+
+msgid "Join/unjoin pictures"
+msgstr "Join/unjoin pictures"
+
+msgid "Join Mapillary pictures"
+msgstr "Join Mapillary 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 "Upload pictures"
+msgstr "Upload pictures"
+
+msgid "Upload Mapillary pictures"
+msgstr "Upload Mapillary pictures"
+
+msgid "Upload pictures."
+msgstr "Upload pictures."
+
+msgid "Walk mode"
+msgstr "Walk mode"
+
+msgid "Start walk mode"
+msgstr "Start 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 "View in website"
+msgstr "View in website"
+
+msgid "Copy key"
+msgstr "Copy key"
+
+msgid "Copy key tag"
+msgstr "Copy key tag"
+
+msgid "Edit on website"
+msgstr "Edit on website"
+
+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 "Submit"
+msgstr "Submit"
+
+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 folder"
+msgstr "Select a folder"
+
+msgid "Explore"
+msgstr "Explore"
+
+msgid "Select a directory"
+msgstr "Select a directory"
+
+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 "Mapillary picture"
+msgstr "Mapillary picture"
+
+msgid "Open Mapillary window"
+msgstr "Open Mapillary window"
+
+msgid "Mapillary dialog"
+msgstr "Mapillary dialog"
+
+msgid "Open Mapillary main dialog"
+msgstr "Open Mapillary main dialog"
+
+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 "Login"
+msgstr "Login"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Download mode"
+msgstr "Download mode"
+
+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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr "The image key ''{0}'' is invalid!"
+
+msgid "The image key must not be null here!"
+msgstr "The image key must not be null here!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "The sequence key ''{0}'' is invalid!"
+
+msgid "The sequence key must not be null here!"
+msgstr "The sequence key must not be null here!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28233,9 +28737,6 @@ 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"
 
@@ -28268,9 +28769,6 @@ msgstr "Private chat"
 msgid "Close tab"
 msgstr "Close tab"
 
-msgid "Logout"
-msgstr "Logout"
-
 msgid "Clear log"
 msgstr "Clear log"
 
@@ -28846,9 +29344,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29037,21 +29532,9 @@ msgstr "Imported Images"
 msgid "Import vector graphics"
 msgstr "Import vector graphics"
 
-msgid "Scale:"
-msgstr "Scale:"
-
-msgid "unit(s) = "
-msgstr "unit(s) = "
-
-msgid "Importing..."
-msgstr "Importing..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVG files [ImportVec plugin] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Please open or create data layer before importing"
-
 msgid "Concourse wizard ..."
 msgstr "Concourse wizard ..."
 
@@ -29268,6 +29751,61 @@ msgstr "Number of {0}-ways junctions found: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "generate all combinations from entry/exit candidates"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Replace Geometry"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Direction index ''{0}'' not found"
 
@@ -29520,402 +30058,6 @@ msgstr "Activates the MapDust bug reporter plugin"
 msgid "Missing input data"
 msgstr "Missing input data"
 
-msgid "Mapillary Images"
-msgstr "Mapillary Images"
-
-msgid "Mapillary layer"
-msgstr "Mapillary layer"
-
-msgid "Total images:"
-msgstr "Total images:"
-
-msgid "images"
-msgstr "images"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr "Traffic sign font at ''{0}'' has wrong format"
-
-msgid "Could not read font-file from ''{0}''"
-msgstr "Could not read font-file from ''{0}''"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Create Mapillary layer"
-
-msgid "Start Mapillary layer"
-msgstr "Start Mapillary layer"
-
-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 "Select pictures"
-msgstr "Select pictures"
-
-msgid "Import pictures into sequence"
-msgstr "Import pictures into sequence"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Import pictures into Mapillary layer in a sequence"
-
-msgid "Join mode"
-msgstr "Join mode"
-
-msgid "Join/unjoin pictures"
-msgstr "Join/unjoin pictures"
-
-msgid "Join Mapillary pictures"
-msgstr "Join Mapillary 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 "Upload pictures"
-msgstr "Upload pictures"
-
-msgid "Upload Mapillary pictures"
-msgstr "Upload Mapillary pictures"
-
-msgid "Upload pictures."
-msgstr "Upload pictures."
-
-msgid "Walk mode"
-msgstr "Walk mode"
-
-msgid "Start walk mode"
-msgstr "Start 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 "Uploaded {0} images"
-msgstr "Uploaded {0} images"
-
-msgid "Approve upload on the website"
-msgstr "Approve upload on the website"
-
-msgid "View in website"
-msgstr "View in website"
-
-msgid "Copy key"
-msgstr "Copy key"
-
-msgid "Copy key tag"
-msgstr "Copy key tag"
-
-msgid "Edit on website"
-msgstr "Edit on website"
-
-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 "Submit"
-msgstr "Submit"
-
-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 folder"
-msgstr "Select a folder"
-
-msgid "Explore"
-msgstr "Explore"
-
-msgid "Select a directory"
-msgstr "Select a directory"
-
-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 "Mapillary picture"
-msgstr "Mapillary picture"
-
-msgid "Open Mapillary window"
-msgstr "Open Mapillary window"
-
-msgid "Mapillary dialog"
-msgstr "Mapillary dialog"
-
-msgid "Open Mapillary main dialog"
-msgstr "Open Mapillary main dialog"
-
-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 "Download mode"
-msgstr "Download mode"
-
-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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr "The image key ''{0}'' is invalid!"
-
-msgid "The image key must not be null here!"
-msgstr "The image key must not be null here!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "The sequence key ''{0}'' is invalid!"
-
-msgid "The sequence key must not be null here!"
-msgstr "The sequence key must not be null here!"
-
 msgid "Measured values"
 msgstr "Measured values"
 
@@ -31444,6 +31586,9 @@ msgstr "PT: Road is under construction"
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr "PT: Route passes a oneway road in the wrong direction"
 
+msgid "moved"
+msgstr "moved"
+
 msgid "rail"
 msgstr "rail"
 
@@ -31540,9 +31685,6 @@ msgstr "Catch"
 msgid "Join"
 msgstr "Join"
 
-msgid "moved"
-msgstr "moved"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Public Transport: Join GTFS stops"
 
@@ -32590,6 +32732,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terrace"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr "To-fix"
 
@@ -33062,6 +33264,84 @@ msgstr "Choose an expiry date for the key:"
 msgid "Create a new signing key"
 msgstr "Create a new signing key"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Forwards"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Backwards"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "No such lane."
 
@@ -34003,9 +34283,6 @@ msgstr "Find primitives with these tags"
 msgid "Multitag Background: highlight"
 msgstr "Multitag Background: highlight"
 
-msgid "Replace Geometry"
-msgstr "Replace Geometry"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Replace geometry of selected object with a new one"
 
@@ -34213,15 +34490,9 @@ msgstr "starts/pauses video playback"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "Backwards"
-
 msgid "jumps n sec back"
 msgstr "jumps n sec back"
 
-msgid "Forward"
-msgstr "Forwards"
-
 msgid "jumps n sec forward"
 msgstr "jumps n sec forwards"
 
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index 1fde0af..4850aa2 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2012-10-03 21:33+0000\n"
-"Last-Translator: Michael Moroni <michael.moroni at openmailbox.org>\n"
+"POT-Creation-Date: 2016-11-06 22:51+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:48+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:41+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: eo\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
-msgstr ""
+msgstr "{0}: opcio ''{1}'' estas ambigua"
 
 msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: opcio ''--{1}'' ne permesas argumenton"
 
 msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: opcio ''{1}{2}'' ne permesas argumenton"
 
 msgid "{0}: option ''{1}'' requires an argument"
-msgstr ""
+msgstr "{0}: opcio ''{1}'' bezonas argumenton"
 
 msgid "{0}: unrecognized option ''--{1}''"
-msgstr ""
+msgstr "{0}: malrekonita opcio ''--{1}''"
 
 msgid "{0}: unrecognized option ''{1}{2}''"
-msgstr ""
+msgstr "{0}: malrekonita opcio ''{1}{2}''"
 
 msgid "{0}: illegal option -- {1}"
-msgstr ""
+msgstr "{0}: malleĝa opcio -- {1}"
 
 msgid "{0}: invalid option -- {1}"
-msgstr ""
+msgstr "{0}: malvalida opcio -- {1}"
 
 msgid "{0}: option requires an argument -- {1}"
-msgstr ""
+msgstr "{0}: opcio bezonas argumenton -- {1}"
 
 msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr ""
+msgstr "malvalida valoro {0} por parametro ''has_arg''"
 
 msgid "Background Terms of Use"
 msgstr ""
 
 msgid "Opening link not supported on current platform (''{0}'')"
-msgstr ""
+msgstr "Malfermo de ligilo estas ne subtenata sur nuna platformo (''{0}'')"
 
 msgid "Executing platform startup hook"
-msgstr ""
+msgstr "Ekzekutado de lanĉada hoko de platformo"
 
 msgid "Building main menu"
-msgstr ""
+msgstr "Konstruado de ĉefa menuo"
 
 msgid "Help"
-msgstr "Helpo"
+msgstr "Helpu"
 
 msgid "Initializing OSM API"
-msgstr ""
+msgstr "Pravalorizado de API de OSM"
 
 msgid "Initializing validator"
-msgstr ""
+msgstr "Pravalorizado de kontrolilo"
 
 msgid "Initializing presets"
 msgstr ""
@@ -80,28 +80,29 @@ msgid "Loading imagery preferences"
 msgstr ""
 
 msgid "Updating user interface"
-msgstr ""
+msgstr "Ĝisdatigado de uzantinterfaco"
 
 msgid "Failed to save default preferences."
-msgstr ""
+msgstr "Malsukcesis konservi defaŭltajn agordojn."
 
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ignorado de nekorekta URL: \"{0}\""
+msgstr ""
 
 msgid "Warning"
 msgstr "Averto"
 
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Ignorado de nekorekta URL de dosiero: \"{0}\""
+msgstr ""
 
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
+"Parametro \"downloadgps\" ne akceptas dosiernomojn aŭ URLjn de dosiero."
 
 msgid "About"
 msgstr "Pri"
 
 msgid "Display the about screen."
-msgstr "Malfermi la fenestron pri informoj."
+msgstr ""
 
 msgid "Java OpenStreetMap Editor"
 msgstr "Ĝava OpenStreetMap-redaktilo"
@@ -110,10 +111,10 @@ msgid "Version {0}"
 msgstr "Versio {0}"
 
 msgid "Last change at {0}"
-msgstr "Lastaj ŝanĝoj je {0}"
+msgstr "Lasta ŝanĝo je {0}"
 
 msgid "Java Version {0}"
-msgstr "Versio de Javo {0}"
+msgstr "Versio de Ĝava {0}"
 
 msgid "Homepage"
 msgstr "Hejmpaĝo"
@@ -125,7 +126,7 @@ msgid "Readme"
 msgstr "Legu min"
 
 msgid "Revision"
-msgstr "Revizio"
+msgstr ""
 
 msgid "Contribution"
 msgstr "Kontribuo"
@@ -143,13 +144,13 @@ msgid "OK"
 msgstr "Bone"
 
 msgid "Report bug"
-msgstr ""
+msgstr "Raporti eraron"
 
 msgid "Failed to locate resource ''{0}''."
-msgstr ""
+msgstr "Malsukcesis lokalizi rimedo ''{0}''."
 
 msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
+msgstr "Malsukcesis ŝarĝi rimedo ''{0}'', erraro {1}"
 
 msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
@@ -158,30 +159,34 @@ msgid_plural ""
 "You are about to launch {0} browser windows.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgstr[0] ""
+"Vi estas estonta lanĉi {0} fenestron de retumilo.<br>Tio povas malordi vian "
+"ekranon kun fenestrojn de retumilo<br>kaj preni iom da tempo por fini."
 msgstr[1] ""
+"Vi estas estonta lanĉi {0} fenestrojn de retumilo.<br>Tio povas malordi vian "
+"ekranon kun fenestrojn de retumilo<br>kaj preni iom da tempo por fini."
 
 msgid "Continue"
 msgstr "Daŭrigi"
 
 msgid "Click to continue and to open {0} browser"
 msgid_plural "Click to continue and to open {0} browsers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Klaki por daŭrigi kaj malfermi {0} retumilon"
+msgstr[1] "Klaki por daŭrigi kaj malfermi {0} retumilojn"
 
 msgid "Cancel"
-msgstr "Rezigni"
+msgstr "Nuligi"
 
 msgid "Click to abort launching external browsers"
-msgstr ""
+msgstr "Klaki por abortigi eksternajn retumilojn"
 
 msgid "Please select at least one already uploaded node, way, or relation."
 msgstr ""
 
 msgid "Please select the target layer."
-msgstr ""
+msgstr "Bonvolu elektu la celan mantelon."
 
 msgid "Select target layer"
-msgstr ""
+msgstr "Elekti celan mantelon"
 
 msgid "Merge"
 msgstr "Kunfandi"
@@ -192,10 +197,10 @@ msgid ""
 msgstr ""
 
 msgid "No target layers"
-msgstr ""
+msgstr "Neniu celaj manteloj"
 
 msgid "Select"
-msgstr ""
+msgstr "Elekti"
 
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -204,18 +209,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Eraro"
-
-msgid "Select image format for WMS layer"
-msgstr ""
-
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
 msgid "Invalid service URL."
 msgstr ""
 
@@ -228,6 +221,18 @@ msgstr ""
 msgid "Could not parse WMS layer list."
 msgstr ""
 
+msgid "Error"
+msgstr "Eraro"
+
+msgid "Select image format for WMS layer"
+msgstr ""
+
+msgid "Select WMS layers"
+msgstr "Elektu WMS mantelojn"
+
+msgid "Add layers"
+msgstr "Aldoni mantelojn"
+
 msgid "Add Node..."
 msgstr "Aldoni Nodon..."
 
@@ -3280,9 +3285,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3684,10 +3686,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3724,6 +3726,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3733,6 +3738,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3769,6 +3777,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3987,6 +4001,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4197,30 +4217,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4464,9 +4484,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4987,9 +5004,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6409,6 +6423,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6648,6 +6665,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7920,9 +7945,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8486,6 +8508,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8537,6 +8562,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8549,6 +8580,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10602,6 +10639,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12687,6 +12727,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13049,6 +13092,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14692,6 +14738,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14803,7 +14852,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14982,6 +15034,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15276,18 +15331,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15297,6 +15340,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15429,6 +15475,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15796,6 +15845,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15910,6 +15962,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16107,6 +16162,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16129,6 +16189,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16285,6 +16348,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17605,6 +17672,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19224,6 +19294,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19894,10 +19967,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
-msgstr "Telefonnumero"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19912,6 +19985,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Telefonnumero"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20781,6 +20860,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20865,6 +20948,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23070,7 +23157,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23737,16 +23830,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23755,18 +23842,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23779,18 +23854,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23983,9 +24046,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23995,6 +24069,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24010,39 +24090,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24061,9 +24126,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24118,10 +24192,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24137,7 +24217,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24182,7 +24262,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24216,6 +24296,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24234,6 +24317,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24324,10 +24410,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24573,6 +24662,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24911,3267 +25021,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
-msgstr "Urbo:"
-
-msgid "State:"
+msgid "Imported images"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Country:"
-msgstr "Lando:"
-
-msgid "Full Address:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Jump to blue"
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Pause"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Align way segment"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Login"
 msgstr ""
 
-msgid "Length preserved"
+msgid "Logout"
 msgstr ""
 
-msgid "Angle preserved"
+msgid "Download mode"
 msgstr ""
 
-msgid "Align with:"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "Align Ways mode"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "Parameter ''{0}'' must not be null"
+msgid "Go forward"
 msgstr ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+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 "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
-msgstr ""
+msgid "City:"
+msgstr "Urbo:"
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
+msgstr "Lando:"
+
+msgid "Full Address:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected even numbers for addresses"
 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] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Country code must be 2 letters"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "on polygon"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Select commune"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Angle preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
-msgstr "adreso"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "show address dialog"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
 msgstr ""
 
 msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Alert Message"
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Street Name:"
+msgstr ""
+
+msgid "Big buildings mode"
+msgstr ""
+
+msgid "Rotate crosshair"
+msgstr ""
+
+msgid "Advanced settings"
+msgstr ""
+
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Create building"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Set buildings size"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Length step:"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "{0} not allowed with the current projection"
+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] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
+msgstr "adreso"
+
+msgid "locality"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "section"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "commune"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Use"
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Color Schemes"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Low resolution (600x400)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Matches"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
 msgstr ""
 
-msgid "Coloring:"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Graphview"
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Ruleset"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Private chat"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Close tab"
 msgstr ""
 
-msgid "Select directory"
+msgid "Clear log"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Visualization"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Node color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrow color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "New bookmark"
+msgid "A By Time"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Distance"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "B By Time"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "refresh the port list"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "Importing data from device."
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "No data found on device."
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "Connection failed."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import"
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Change Color"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element without name"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Offset"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "mm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "cm"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "m"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "km"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined right here"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "height (m)"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "width (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Access class"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access types"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Road requirements"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Normal"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 180"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Rotate 270"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Previous image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Next image"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Rotate image right"
+msgid "default"
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "end nodes"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "incline"
 msgstr ""
 
-msgid "Imported Images"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Parameters:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Coloring:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Importing..."
+msgid "Graphview"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Ruleset"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Visualization"
 msgstr ""
 
-msgid "POWER"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Node color"
 msgstr ""
 
-msgid "Working Level"
+msgid "Arrow color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "New bookmark"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Fitting"
+msgid "Choose node color"
 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>"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "Highest Level"
+msgid "graphview default node"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default segment"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "InfoMode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "km/h"
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Track name: "
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "Change Color"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "junctions"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
 msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "create the channel digraph"
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "Check "
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Offset"
 msgstr ""
 
-msgid "Search "
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "mm"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "km"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "Tracing"
+msgid "Imagery ID"
 msgstr ""
 
-msgid "checking cache..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Reason"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "east"
-msgstr "oriento"
-
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
-msgstr "nordo"
-
-msgid "northwest"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "west"
-msgstr "okcidento"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
+msgstr ""
 
-msgid "southwest"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "south"
-msgstr "sudo"
+msgid "Store imagery offset"
+msgstr ""
 
-msgid "southeast"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Normal"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Source text"
+msgid "Previous image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Next image"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "POWER"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Working Level"
 msgstr ""
 
-msgid "Not connected"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Connecting"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connected"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "no name"
-msgstr "ne nomo"
+msgid "The object preset you want to tag."
+msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Status"
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Way Info"
+msgid "Fitting"
 msgstr ""
 
-msgid "Speed"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Course"
+msgid "Level Selection"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "Highest Level"
 msgstr ""
 
-msgid "Center Once"
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "InfoMode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Open MapDust"
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Missing input data"
+msgid "km/h"
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Total images:"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "images"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Mapillary"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export images"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Import pictures"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import local pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "junctions"
 msgstr ""
 
-msgid "Select pictures"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Join mode"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Submit changeset"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "Check "
 msgstr ""
 
-msgid "Upload pictures"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload pictures."
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Walk mode"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "View in website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Copy key"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Correct"
 msgstr ""
 
-msgid "Edit on website"
+msgid "Wrong"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Submit"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Export all images"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Select a folder"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Speed limit"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Give way"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "No entry"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No overtaking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "No turn"
+msgid "Tracing"
 msgstr ""
 
-msgid "Years"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Months"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Days"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Not older than: "
+msgid "east"
+msgstr "oriento"
+
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
+msgstr "nordo"
+
+msgid "northwest"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "west"
+msgstr "okcidento"
+
+msgid "southwest"
 msgstr ""
 
-msgid "Choose signs"
-msgstr ""
+msgid "south"
+msgstr "sudo"
 
-msgid "Mapillary history"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Next picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Play"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Pause"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-msgid "Go forward"
+msgid "Maximum age of each cached file in days. Default is 100"
 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"
+msgid "Data source text. Default is Landsat."
 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 "Downloading image tile..."
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Could not acquire image"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Not connected"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connecting"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "Connected"
 msgstr ""
 
-msgid "Downloading"
+msgid "no name"
+msgstr "ne nomo"
+
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29633,6 +29780,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29728,9 +29878,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30742,6 +30889,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31189,6 +31396,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32015,9 +32300,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32211,15 +32493,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/es.po b/i18n/po/es.po
index f148b42..1c02cde 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-09-04 10:02+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-01 05:17+0000\n"
+"Last-Translator: Leo Arias <leo.arias at canonical.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: 2016-09-06 05:29+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:08+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: es\n"
 "X-Language: es_ES\n"
 "X-Source-Language: C\n"
@@ -212,18 +212,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Agregar capa de imágenes {0}"
 
-msgid "Error"
-msgstr "Error"
-
-msgid "Select image format for WMS layer"
-msgstr "Seleccionar formato de imagen para la capa WMS"
-
-msgid "Select WMS layers"
-msgstr "Seleccionar capas WMS"
-
-msgid "Add layers"
-msgstr "Añadir capas"
-
 msgid "Invalid service URL."
 msgstr "URL del servicio inválida."
 
@@ -236,6 +224,18 @@ msgstr "No se pudo recuperar la lista de las capas WMS."
 msgid "Could not parse WMS layer list."
 msgstr "No se pudo deserializar la lista de las capas WMS."
 
+msgid "Error"
+msgstr "Error"
+
+msgid "Select image format for WMS layer"
+msgstr "Seleccionar formato de imagen para la capa WMS"
+
+msgid "Select WMS layers"
+msgstr "Seleccionar capas WMS"
+
+msgid "Add layers"
+msgstr "Añadir capas"
+
 msgid "Add Node..."
 msgstr "Añadir nodo..."
 
@@ -3608,9 +3608,6 @@ msgstr "Identificador de conjunto matriz"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Sin capas definidas en el documento getCapabilities: {0}"
 
-msgid "No layer selected"
-msgstr "Sin capa seleccionada"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4061,12 +4058,12 @@ msgstr "Multiples asociaciones de relaciones de calle"
 msgid "House number without street"
 msgstr "Numero de casa sin una calle"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Número de portal ''{0}'' duplicado"
-
 msgid "Duplicate house numbers"
 msgstr "Número de portal duplicados"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Número de portal ''{0}'' duplicado"
+
 msgid "Multiple street names in relation"
 msgstr "Múltiples nombres de calles en la relación"
 
@@ -4104,6 +4101,10 @@ msgstr "Líneas de costa"
 msgid "This test checks that coastlines are correct."
 msgstr "Este test comprueba si las costas están correctas."
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+"Línea de costa invertida: la tierra no puede situarse al lado izquierdo"
+
 msgid "Unconnected coastline"
 msgstr "Línea de costa sin conectar"
 
@@ -4113,6 +4114,9 @@ msgstr "Línea de costa desordenada"
 msgid "Reversed coastline"
 msgstr "Línea de costa invertida"
 
+msgid "invalid coastline"
+msgstr "linea de costa no válida"
+
 msgid "Conditional Keys"
 msgstr "Claves Condicionales"
 
@@ -4149,6 +4153,12 @@ msgstr "Límites que se cruzan"
 msgid "Crossing barriers"
 msgstr "Cruzando barreras"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr "Vías que se cruzan a sí mismas"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4387,6 +4397,12 @@ msgstr "Miembro de multipolígono no tiene un rol útil"
 msgid "Non-Way in multipolygon"
 msgstr "No-vía dentro de multipolígono"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr "Miembro(s) de un multipolígono repetido(s) con un rol diferente"
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr "Miembro(s) de un multipolígono repetido(s) con el mismo rol"
+
 msgid "Missing name:* translation"
 msgstr "Traducción name:* inexistente"
 
@@ -4618,30 +4634,30 @@ msgstr "Los valores de la propiedad contienen múltiples espacios en blanco"
 msgid "Property values contain HTML entity"
 msgstr "Los valores de propiedad contienen entidad de HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Llave \"{0}\" se parece a \"{1}\"."
-
 msgid "Misspelled property key"
 msgstr "Clave de propiedad mal escrito"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "La clave ''{0}\" no existe en los predefinidos"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Llave \"{0}\" se parece a \"{1}\"."
 
 msgid "Presets do not contain property key"
 msgstr "Esta clave no está predefinida"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Valor ''{0}'' para clave ''{1}'' se parece a ''{2}''"
+msgid "Key ''{0}'' not in presets."
+msgstr "La clave ''{0}\" no existe en los predefinidos"
 
 msgid "Misspelled property value"
 msgstr "valor de la propiedad mal escrito"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "El valor \"{0}\" para la clave \"{1}\" no está en los predefinidos."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Valor ''{0}'' para clave ''{1}'' se parece a ''{2}''"
 
 msgid "Presets do not contain property value"
 msgstr "Los predefinidos no contiene valores apropiados"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "El valor \"{0}\" para la clave \"{1}\" no está en los predefinidos."
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4893,10 +4909,6 @@ msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 "Este test comprueba la dirección de vías fluviales, terrestres y de costa."
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-"Línea de costa invertida: la tierra no puede situarse al lado izquierdo"
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 "Línea terrestre invertida: la tierra no puede situarse al lado izquierdo"
@@ -4944,8 +4956,8 @@ msgstr[1] "{0} nodos"
 
 msgid "{0} member"
 msgid_plural "{0} members"
-msgstr[0] "miembro {0}"
-msgstr[1] "miembros {0}"
+msgstr[0] "{0} miembro"
+msgstr[1] "{0} miembros"
 
 msgid "public transport"
 msgstr "transporte público"
@@ -5461,9 +5473,6 @@ msgstr "La longitud geográfica en el puntero del ratón."
 msgid "System of measurement changed to {0}"
 msgstr "El sistema de medición ha cambiado a {0}"
 
-msgid "Layer not in list."
-msgstr "capa no listada"
-
 msgid "Default (open, closed, new)"
 msgstr "Por defecto (abierto, cerrado, nuevo)"
 
@@ -7039,6 +7048,9 @@ msgstr "Ordenar notas"
 msgid "Sort"
 msgstr "Ordenar"
 
+msgid "Open the note in an external browser"
+msgstr "Abrir la nota en un navegador externo"
+
 msgid "Object type:"
 msgstr "Tipo de objeto:"
 
@@ -7294,6 +7306,16 @@ msgid "Download the content of the selected changesets from the server"
 msgstr ""
 "Descarga el contenido de las modificaciones seleccionadas desde el servidor"
 
+msgid "Download changed objects"
+msgstr "Descargar los objetos modificados"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+"Descargar la versión actual de los objetos modificados en los conjuntos de "
+"cambios seleccionados"
+
 msgid "My changesets"
 msgstr "Mis modificaciones"
 
@@ -7925,7 +7947,7 @@ msgstr ""
 "Abrir navegador con las estadísticas de Taginfo para el objeto selecionado"
 
 msgid "Paste Value"
-msgstr "Pegar Valor"
+msgstr "Pegar valor"
 
 msgid "Paste the value of the selected tag from clipboard"
 msgstr "Pegar el valor de la etiqueta seleccionada desde el portapapeles"
@@ -7937,7 +7959,7 @@ msgid "Copy the value of the selected tag to clipboard"
 msgstr "Copiar el valor de la etiqueta seleccionada al portapapeles"
 
 msgid "Copy selected Key(s)/Value(s)"
-msgstr "Copiar Clave(s)/Valor(es) seleccionado(s)"
+msgstr "Copiar clave(s) y valor(es) seleccionado(s)"
 
 msgid "Copy the key and value of the selected tag(s) to clipboard"
 msgstr ""
@@ -7945,7 +7967,7 @@ msgstr ""
 "portapapeles"
 
 msgid "Copy all Keys/Values"
-msgstr "Copiar todos los Claves/Valores"
+msgstr "Copiar todas las claves y valores"
 
 msgid "Copy the key and value of all the tags to clipboard"
 msgstr "Copiar la clave y el valor de todas las etiquetas en el portapapeles"
@@ -8723,9 +8745,6 @@ msgstr "Introduzca el nombre de un lugar que buscar"
 msgid "Areas around places"
 msgstr "Áreas en torno a lugares"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida"
-
 msgid "Search ..."
 msgstr "Buscar..."
 
@@ -9380,6 +9399,9 @@ msgstr "Cambios sin guardar. ¿Guardarlos/subirlos antes de salir?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Cambios sin guardar. ¿Guardarlos/subirlos antes de borrar?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "Cambios sin guardar - ¿Guardar/Subir antes de reiniciar?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Subiendo y grabando la capas modificadas..."
 
@@ -9447,6 +9469,12 @@ msgstr "¡Salir ahora!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Salir de JOSM sin guardar. Los cambios sin grabar se perderán."
 
+msgid "Restart now!"
+msgstr "¡Reiniciar ahora!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr "Reiniciar JOSM sin guardar. Los cambios no guardados se perderán."
+
 msgid "Delete now!"
 msgstr "¡Eliminar ahora!"
 
@@ -9460,6 +9488,14 @@ msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 "Salir de JOSM tras guardar. Los cambios sin grabar se subirán y/o guardarán."
 
+msgid "Perform actions before restarting"
+msgstr "Realizar acciones antes de reiniciar"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+"Reiniciar JOSM guardando. Los cambios sin guardar serán subidos y/o "
+"guardados."
+
 msgid "Perform actions before deleting"
 msgstr "Realizar acciones antes de eliminar"
 
@@ -11813,6 +11849,9 @@ msgstr "Dibuja flechas de sentido único."
 msgid "Draw segment order numbers"
 msgstr "Dibujar los números de orden de los segmentos"
 
+msgid "Draw segment order numbers on selected way"
+msgstr "Dibujar números de orden de segmento en la vía seleccionada"
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibujar los límites de los datos descargados"
 
@@ -13733,13 +13772,13 @@ msgid "false: the property is explicitly switched off"
 msgstr "falso: la propiedad se encuentra sin marcar"
 
 msgid "false: the property ''{0}'' is explicitly switched off"
-msgstr "falso: la propiedad ''{0}'' está explícitamente apagada"
+msgstr "falso: la propiedad ''{0}'' se encuentra sin marcar"
 
 msgid "true: the property is explicitly switched on"
 msgstr "verdadero: la propiedad se encuentra marcada"
 
 msgid "true: the property ''{0}'' is explicitly switched on"
-msgstr "verdadero: la propiedad ''{0}'' está explícitamente encendida"
+msgstr "verdadero: la propiedad ''{0}'' se encuentra marcada"
 
 msgid ""
 "partial: different selected objects have different values, do not change"
@@ -14148,6 +14187,9 @@ msgstr "Éxito en la importación NMEA:"
 msgid "NMEA import failure!"
 msgstr "¡Fallo en la importación NMEA!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida"
+
 msgid "Note Files"
 msgstr "Archivos de notas"
 
@@ -14557,6 +14599,9 @@ msgstr "Subiendo datos..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Se encontró un id 0 inesperado para la primitiva osm"
 
+msgid "Failed to evaluate {0}"
+msgstr "No se pudo evaluar {0}"
+
 msgid "Downloading data..."
 msgstr "Descargando datos..."
 
@@ -15021,11 +15066,11 @@ msgid_plural ""
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
 msgstr[0] ""
-"El complemento {0} requiere un complemento que no se encontró. El "
+"El complemento {0} requiere otros complemento que no se encontró. El "
 "complemento que falta es:"
 msgstr[1] ""
-"El complemento {0} requiere {1}  complementos que no se encontraron. El "
-"plugin que falta es:"
+"El complemento {0} requiere de {1}  complementos que no se encontraron. El "
+"complemento que falta es:"
 
 msgid "Download and restart"
 msgstr "Descargar  y reiniciar"
@@ -16497,6 +16542,9 @@ msgstr "Tiris: DGM (modelo de terreno)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (modelo de superficie)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viena: Mehrzweckkarte (propósito general)"
 
@@ -16608,8 +16656,11 @@ msgstr "Vista de Geodatastyrelsen Cadastral Parcels INSPIRE"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1,6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr "SDFE Overflade Skyggekort (40 cm)"
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16790,6 +16841,9 @@ msgstr "Avión no tripulado Imágenes 2014 (Haití)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Imágenes de drones de Canaán (Haití) de noviembre de 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr "Imágenes de Drones Matthew(Haiti) Octubre 2016"
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortofoto 2000"
 
@@ -17084,18 +17138,6 @@ msgstr "Freemap.sk Ciclismo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Esquí"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Mapa de Katastrálna Eslovenia (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Mapa de Katastrálna Eslovenia (KaPor, 2010-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Atlas urbano de Eslovaquia EEA GMES"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Eslovaquia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Mapas históricos de Eslovaquia"
 
@@ -17105,6 +17147,9 @@ msgstr "RABA-KGZ: Eslovenia - Uso agrícola"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Eslovenia - Área urbanizada"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Sudáfrica CD:NGI Aérea"
 
@@ -17238,6 +17283,9 @@ msgstr "Callejero del servicio de Bosques de EEUU"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ucrania - Ortofotomapas 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Ucrania - Kiev 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "Séptima Serie (OS7)"
 
@@ -17640,6 +17688,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Descargar datos OSM cercanos a una vía"
 
+msgid "Dxf Import"
+msgstr "Importar DXF"
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17799,6 +17850,9 @@ msgstr ""
 "la red de carreteras de OSM. El componente no funciona con los datos de OSM "
 "originales, sino que estos se transforman en un canal de digrafos."
 
+msgid "Tools to help import Kartverket N50"
+msgstr "Herramientas para importar Kartverket N50"
+
 msgid "Helps vectorizing WMS images."
 msgstr "Ayuda a vectorizar imágenes de un servicio WMS"
 
@@ -18061,6 +18115,13 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Crea hileras de edificios adosados a partir de bloques únicos"
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+"Añade un cuadro de diálogo de lista de tareas que hace que sea fácil pasar "
+"por una larga lista de objetos"
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -18092,6 +18153,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Complemento para firmar digitalmente datos OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr "Editor para agregar etiquetas de carriles de giro a las carreteras"
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18129,7 +18193,8 @@ msgstr ""
 
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
-"Descargar fácilmente a lo largo de una larga serie de vías interconectadas"
+"Permite descargar sucesivamente las diferentes vías interconectadas que "
+"configuran un elemento (carretera, río, frontera, etc.)"
 
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
@@ -18265,6 +18330,10 @@ msgid "No wheeled vehicle"
 msgstr "No vehículo de ruedas"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "campo de juego"
 
@@ -19597,6 +19666,9 @@ msgstr "construcción"
 msgid "Ford"
 msgstr "Vado"
 
+msgid "stepping_stones"
+msgstr "peldaños"
+
 msgid "Ways"
 msgstr "Vías"
 
@@ -21246,6 +21318,9 @@ msgstr "Pista"
 msgid "Taxiway"
 msgstr "Pista de rodaje"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Pista de aterrizaje de helicópteros"
 
@@ -21861,7 +21936,7 @@ msgid "Education"
 msgstr "Educación"
 
 msgid "Kindergarten"
-msgstr "Jardín de infancia"
+msgstr "Jardín de infancia o guardería"
 
 msgid "School"
 msgstr "Escuela, colegio o instituto de educación secundaria"
@@ -21917,11 +21992,11 @@ msgstr "Número de punto"
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
-msgid "Phone Number"
-msgstr "Número de teléfono"
+msgid "Emergency Phone Number"
+msgstr "Número de teléfono de emergencia"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Utilizar código internacional, como +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -21935,6 +22010,12 @@ msgstr "Estación de ambulancias"
 msgid "Automated Defibrillator"
 msgstr "Desfibrilador automático"
 
+msgid "Location description"
+msgstr "Descripción de ubicación"
+
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
 msgid "Located inside a building?"
 msgstr "¿Ubicado dentro de un edificio?"
 
@@ -22540,7 +22621,7 @@ msgid "Swimming"
 msgstr "Natación"
 
 msgid "swimming_pool"
-msgstr "pileta"
+msgstr "piscina"
 
 msgid "water_park"
 msgstr "parque acuático"
@@ -22808,6 +22889,10 @@ msgid "university"
 msgstr "universidad"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "hospital"
 
@@ -22892,6 +22977,10 @@ msgid "public"
 msgstr "público"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "ruinas"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Niveles"
 
@@ -25110,8 +25199,15 @@ msgstr "Reserva natural"
 msgid "Scree"
 msgstr "Pedregal"
 
-msgid "An accumulation of loose rocks."
-msgstr "Una acumulación de rocas sueltas."
+msgid "An accumulation of loose angular rocks."
+msgstr "Una acumulación de rocas angulares sueltas."
+
+msgid "Shingle"
+msgstr "Guijarros"
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
+"Una acumulación de rocas redondeadas sueltos en una playa o lecho del río."
 
 msgid "Fell"
 msgstr "Braña"
@@ -25799,17 +25895,11 @@ msgstr "Rutas"
 msgid "Bicycle Route"
 msgstr "Ruta de ciclismo"
 
-msgid "icn"
-msgstr "icn"
+msgid "national"
+msgstr "nacional"
 
-msgid "ncn"
-msgstr "ncn"
-
-msgid "rcn"
-msgstr "rcn"
-
-msgid "lcn"
-msgstr "lcn"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Ruta de ciclismo de montaña"
@@ -25817,18 +25907,6 @@ msgstr "Ruta de ciclismo de montaña"
 msgid "Hiking Route"
 msgstr "Ruta de senderismo"
 
-msgid "iwn"
-msgstr "iwn"
-
-msgid "nwn"
-msgstr "nwn"
-
-msgid "rwn"
-msgstr "rwn"
-
-msgid "lwn"
-msgstr "lwn"
-
 msgid "infrastructure"
 msgstr "infraestructura"
 
@@ -25841,18 +25919,6 @@ msgstr "Ruta peatonal"
 msgid "Riding Route"
 msgstr "Ruta a caballo"
 
-msgid "ihn"
-msgstr "Ruta internacional"
-
-msgid "nhn"
-msgstr "Ruta nacional"
-
-msgid "rhn"
-msgstr "Ruta regional"
-
-msgid "lhn"
-msgstr "Ruta local"
-
 msgid "Piste Route"
 msgstr "Ruta de pista"
 
@@ -26046,9 +26112,20 @@ msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 "Vía con {0}. Etiquetar cada número de portal por separado si es posible."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr "El mismo valor que {0} y {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} sin {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} sin {1} o {2}"
 
@@ -26058,6 +26135,12 @@ msgstr "{0} sin {1}, {2} o {3}"
 msgid "{0} together with {1}"
 msgstr "{0} junto con {1}"
 
+msgid "suspicious tag combination"
+msgstr "combinación de etiquetas sospechosa"
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr "dos objetos, uno con {0} y otro con {1} + {2} + {3}"
+
 msgid "incomplete object: only {0}"
 msgstr "objeto incompleto: sólo {0}"
 
@@ -26073,39 +26156,24 @@ msgstr "{0} junto a {1} y valores en conflicto"
 msgid "{0} on suspicious object"
 msgstr "{0} en objeto sospechoso"
 
-msgid "restaurant without name"
-msgstr "restaurant sin name"
-
-msgid "{0} used with {1}"
-msgstr "{0} se utiliza con {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "lago/laguna utilizado como piscina"
 
 msgid "sport without physical feature"
 msgstr "deporte sin elemento físico"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} debería estar en el nodo donde {1} y {2} se intersectan"
-
 msgid "alternative name without {0}"
 msgstr "nombre alternativo sin {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "uso incompleto de {0} en lugar de {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "El mismo valor que {0} y {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "El mismo valor que {0}, {1} y {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} y {1} junto con {2} y valores en conflicto"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Combinación de etiquetas sospechosa: {0} and {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} en una relación sin {1}"
 
@@ -26130,9 +26198,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} junto con {1} y {2}. Eliminar {1} y {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Diferente número de carriles en las claves {0} y {1}"
+
+msgid "possibly missing {0} tag"
+msgstr "posible etiqueta {0} faltante"
+
 msgid "{0} is deprecated"
 msgstr "{0} está obsoleto"
 
+msgid "deprecated tagging"
+msgstr "etiquetado obsoleto"
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "'' {0}'' no tiene sentido. Utilice etiquetas más específicas, por ejemplo '' "
@@ -26204,12 +26281,18 @@ msgstr "Etiqueta sin especificar {0}"
 msgid "Definition of {0} is unclear"
 msgstr "La definición de {0} no es clara"
 
+msgid "{0} + {1} + {2}"
+msgstr "{0} + {1} + {2}"
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} no es recomendado. Use la función \"Invertir vías\" del menú "
 "Herramientas."
 
+msgid "{0}"
+msgstr "{0}"
+
 msgid "key with uncommon character"
 msgstr "clave con carácter poco frecuente"
 
@@ -26225,8 +26308,8 @@ msgstr "{0} fue reemplazada por {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} está en desuso. Utilice en su lugar el prefijo clave {1}."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "clave cuestionable (termina con un número): {0}"
+msgid "questionable key (ending with a number)"
+msgstr ""
 
 msgid "The key {0} has an uncommon value."
 msgstr "La clave {0} tiene un valor poco común."
@@ -26270,8 +26353,8 @@ msgstr "Áreas naturales idénticas superpuesta"
 msgid "Overlapping Identical Landuses"
 msgstr "Utilizaciones del suelo idénticas superpuestas"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} debe estar conectado a una vía"
+msgid "isolated node which must be connected to a way"
+msgstr "nodo aislado que debe estar conectado a una vía"
 
 msgid "node connects waterway and bridge"
 msgstr "el nodo conecta a una vía fluvial y puente"
@@ -26308,6 +26391,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Línea de costa hacia adentro {1}"
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} debería estar en el nodo donde {1} y {2} se intersectan"
+
 msgid "abbreviated street name"
 msgstr "nombre de calle abreviado"
 
@@ -26326,6 +26412,9 @@ msgstr "highway sin una referencia"
 msgid "temporary highway type"
 msgstr "tipo de carretera de uso temporal"
 
+msgid "{0} used with {1}"
+msgstr "{0} se utiliza con {1}"
+
 msgid "street name contains ss"
 msgstr "nombre de calle contiene ss"
 
@@ -26425,11 +26514,14 @@ msgstr "denominación judía desconocida"
 msgid "{0} is unnecessary"
 msgstr "{0} no es necesario"
 
+msgid "unnecessary tag"
+msgstr "etiqueta innecesaria"
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} no es necesario para {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} no tiene sentido"
+msgid "{0} makes no sense"
+msgstr "{0} no tiene sentido"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Nodos que duplican las etiquetas de las vías padre"
@@ -26694,6 +26786,27 @@ msgstr "Subiendo traza GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Trazas subidas a openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importando..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr "Archivos DXF [componente ImportDxf] (* .dxf)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Por favor abra o cree una capa de datos antes de la importación"
+
+msgid "Import dxf"
+msgstr "Importar DXF"
+
+msgid "Scale:"
+msgstr "Escala:"
+
+msgid "unit(s) = "
+msgstr "Unidad(es) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Muestra el perfil de elevación"
 
@@ -27050,6 +27163,409 @@ 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 "Total images:"
+msgstr "Número total de imágenes:"
+
+msgid "images"
+msgstr "Imágenes"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "La fuente de señal de tráfico en ''{0}'' tiene un formato incorrecto"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "No se pudo leer el archivo fuente de \"{0}\""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Crear capa de Mapillary"
+
+msgid "Start Mapillary layer"
+msgstr "Iniciar capa de 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 "Select pictures"
+msgstr "Seleccionar imágenes"
+
+msgid "Import pictures into sequence"
+msgstr "Importar imágenes dentro de una secuencia"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importar imágenes dentro de la capa de Mapillary en una secuencia"
+
+msgid "Join mode"
+msgstr "Modo unión"
+
+msgid "Join/unjoin pictures"
+msgstr "Unir/separar imágenes"
+
+msgid "Join Mapillary pictures"
+msgstr "Unir imágenes de Mapillary"
+
+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 "Upload pictures"
+msgstr "Subir fotos"
+
+msgid "Upload Mapillary pictures"
+msgstr "Subir fotos Mapillary"
+
+msgid "Upload pictures."
+msgstr "Subir imágenes."
+
+msgid "Walk mode"
+msgstr "Modo caminar"
+
+msgid "Start walk mode"
+msgstr "Iniciar 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 "View in website"
+msgstr "Ver en la página web"
+
+msgid "Copy key"
+msgstr "Copiar llave"
+
+msgid "Copy key tag"
+msgstr "Copiar etiqueta de llave"
+
+msgid "Edit on website"
+msgstr "Editar en página web"
+
+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 "Submit"
+msgstr "Enviar"
+
+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 folder"
+msgstr "Seleccionar una carpeta"
+
+msgid "Explore"
+msgstr "Explorar"
+
+msgid "Select a directory"
+msgstr "Seleccionar un directorio"
+
+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 "Mapillary picture"
+msgstr "Imágenes de Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Abrir ventana de Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Diálogo de Mapillary"
+
+msgid "Open Mapillary main dialog"
+msgstr "Abrir ventana principal 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 mouse está en su icono"
+
+msgid "Login"
+msgstr "Acceder"
+
+msgid "Logout"
+msgstr "Cerrar sesión"
+
+msgid "Download mode"
+msgstr "Modo de descarga"
+
+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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+"El área de OSM descargado es demasiado grande. El modo de descarga se ha "
+"cambiado a la zona de OSM hasta que se reinicie la capa."
+
+msgid "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 "The image key ''{0}'' is invalid!"
+msgstr "¡La clave de imagen '' {0} '' no es válida!"
+
+msgid "The image key must not be null here!"
+msgstr "¡La clave de imagen no debe ser nula aquí!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "¡La secuencia de clave ''{0}'' no es válida!"
+
+msgid "The sequence key must not be null here!"
+msgstr "¡La clave de secuencia no debe ser nula aquí!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28940,9 +29456,6 @@ 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"
 
@@ -28975,9 +29488,6 @@ msgstr "Conversación privada"
 msgid "Close tab"
 msgstr "Cerrar pestaña"
 
-msgid "Logout"
-msgstr "Cerrar sesión"
-
 msgid "Clear log"
 msgstr "Limpiar registro"
 
@@ -29569,9 +30079,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29766,21 +30273,9 @@ msgstr "Imágenes importadas"
 msgid "Import vector graphics"
 msgstr "Importar gráficos vectoriales"
 
-msgid "Scale:"
-msgstr "Escala:"
-
-msgid "unit(s) = "
-msgstr "Unidad(es) = "
-
-msgid "Importing..."
-msgstr "Importando..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "Archivos SVG [complemento ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Por favor abra o cree una capa de datos antes de la importación"
-
 msgid "Concourse wizard ..."
 msgstr "Asistente de vestíbulo..."
 
@@ -30002,6 +30497,66 @@ msgstr "Número de cruces de {0}-vías encontrados: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "generar todas las combinaciones de candidatos para entrada y salida"
 
+msgid "Check the direction"
+msgstr "Compruebe la dirección"
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+"Comprobar el sentido de la corriente/río seleccionado. ¿Es correcto?\n"
+" Progreso: "
+
+msgid "Correct"
+msgstr "Correcto"
+
+msgid "Wrong"
+msgstr "Incorrecto"
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr "<HTML>Dirección <U>C</U>orrecta </HTML>"
+
+msgid "Direction of river is correct."
+msgstr "La dirección del río es correcta."
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr "<HTML>Dirección <U>C</E>rrónea </HTML>"
+
+msgid "Direction of river is wrong."
+msgstr "La dirección del río es errónea."
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr "<HTML><U>I</U>gnorar esta vía</HTML>"
+
+msgid "Ignore direction of this way."
+msgstr "Ignorar dirección de esta vía."
+
+msgid "Check direction of streams"
+msgstr "Comprobar el sentido de las corrientes"
+
+msgid "Check direction of streams and rivers"
+msgstr "Comprueba el sentido de arroyos y ríos"
+
+msgid "No more directions to check!"
+msgstr "¡No hay más direcciones para comprobar!"
+
+msgid "Replace way"
+msgstr "Reemplazar vía"
+
+msgid "Replace way of selected way with a new way"
+msgstr "Reemplazar la vía de manera selectiva por otra nueva"
+
+msgid "Replace Geometry"
+msgstr "Reemplazar geometría"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+"Esta herramienta sustituye la línea de costa de una vía por otra, por lo que "
+"requiere exactamente dos vías que representen líneas de costa para ser "
+"seleccionados."
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Índice de dirección ''{0}'' no encontrado"
 
@@ -30261,406 +30816,6 @@ msgstr "Activar el complemento de informes de error de MapDust"
 msgid "Missing input data"
 msgstr "Faltan datos de entrada"
 
-msgid "Mapillary Images"
-msgstr "Imágenes de Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Capa de Mapillary"
-
-msgid "Total images:"
-msgstr "Número total de imágenes:"
-
-msgid "images"
-msgstr "Imágenes"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr "La fuente de señal de tráfico en ''{0}'' tiene un formato incorrecto"
-
-msgid "Could not read font-file from ''{0}''"
-msgstr "No se pudo leer el archivo fuente de \"{0}\""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Crear capa de Mapillary"
-
-msgid "Start Mapillary layer"
-msgstr "Iniciar capa de 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 "Select pictures"
-msgstr "Seleccionar imágenes"
-
-msgid "Import pictures into sequence"
-msgstr "Importar imágenes dentro de una secuencia"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importar imágenes dentro de la capa de Mapillary en una secuencia"
-
-msgid "Join mode"
-msgstr "Modo unión"
-
-msgid "Join/unjoin pictures"
-msgstr "Unir/separar imágenes"
-
-msgid "Join Mapillary pictures"
-msgstr "Unir imágenes de Mapillary"
-
-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 "Upload pictures"
-msgstr "Subir fotos"
-
-msgid "Upload Mapillary pictures"
-msgstr "Subir fotos Mapillary"
-
-msgid "Upload pictures."
-msgstr "Subir imágenes."
-
-msgid "Walk mode"
-msgstr "Modo caminar"
-
-msgid "Start walk mode"
-msgstr "Iniciar 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 "Uploaded {0} images"
-msgstr "Subidas {0} imágenes"
-
-msgid "Approve upload on the website"
-msgstr "Aprobar subida en página web"
-
-msgid "View in website"
-msgstr "Ver en la página web"
-
-msgid "Copy key"
-msgstr "Copiar llave"
-
-msgid "Copy key tag"
-msgstr "Copiar etiqueta de llave"
-
-msgid "Edit on website"
-msgstr "Editar en página web"
-
-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 "Submit"
-msgstr "Enviar"
-
-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 folder"
-msgstr "Seleccionar una carpeta"
-
-msgid "Explore"
-msgstr "Explorar"
-
-msgid "Select a directory"
-msgstr "Seleccionar un directorio"
-
-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 "Mapillary picture"
-msgstr "Imágenes de Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Abrir ventana de Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Diálogo de Mapillary"
-
-msgid "Open Mapillary main dialog"
-msgstr "Abrir ventana principal 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 mouse está en su icono"
-
-msgid "Download mode"
-msgstr "Modo de descarga"
-
-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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"El área de OSM descargada es demasiado grande. El modo de descarga se ha "
-"cambiado a semiautomática hasta que se reinicie la capa."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr "¡La clave de imagen '' {0} '' no es válida!"
-
-msgid "The image key must not be null here!"
-msgstr "¡La clave de imagen no debe ser nula aquí!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "¡La secuencia de clave ''{0}'' no es válida!"
-
-msgid "The sequence key must not be null here!"
-msgstr "¡La clave de secuencia no debe ser nula aquí!"
-
 msgid "Measured values"
 msgstr "Valores medidos"
 
@@ -31130,7 +31285,7 @@ msgid "MapInfo files"
 msgstr "Archivos MapInfo"
 
 msgid "Shapefiles"
-msgstr "Archivos hape"
+msgstr "Archivos ESRI shapefile"
 
 msgid ""
 "Unable to detect Coordinate Reference System.\n"
@@ -32244,6 +32399,9 @@ msgstr ""
 "PT: La ruta pasa por una carretera de un único sentido en la dirección "
 "equivocada"
 
+msgid "moved"
+msgstr "Movido"
+
 msgid "rail"
 msgstr "ferrocarril"
 
@@ -32341,9 +32499,6 @@ msgstr "Capturar"
 msgid "Join"
 msgstr "Unir"
 
-msgid "moved"
-msgstr "Movido"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Transporte público: unir paradas GTFS"
 
@@ -33410,6 +33565,72 @@ msgstr ""
 msgid "Terrace"
 msgstr "Hilera de casas adosadas"
 
+msgid "Pass over element without marking it"
+msgstr "Pasar del elemento sin marcarlo"
+
+msgid "Mark element done"
+msgstr "Marcar el elemento como hecho"
+
+msgid "Todo list"
+msgstr "Lista por hacer"
+
+msgid "Open the todo list."
+msgstr "Abrir la lista por hacer"
+
+msgid "Zoom to the selected item in the todo list."
+msgstr "Acercar para seleccionar el elemento en la lista por hacer."
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+"Seleccionar y acercar todos los elementos sin marcar en la lista por hacer."
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+"Ir al elemento siguiente pero dejar este elemento en la lista por hacer. ([)."
+
+msgid "Add the selected items to the todo list."
+msgstr "Añadir los elementos seleccionados a la lista por hacer."
+
+msgid "Mark selected"
+msgstr "Marcar seleccionados"
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr "Marcar todos"
+
+msgid "Mark all items in the todo list as done."
+msgstr "Marcar como hechos todos los elementos en la lista por hacer."
+
+msgid "Unmark all"
+msgstr "Desmarcar todos"
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+"Desmarcar todos los elementos que han sido marcados como hechos en la lista "
+"de cosas por hacer."
+
+msgid "Clear the todo list"
+msgstr "Limpiar la lista de cosas por hacer"
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+"Eliminar todos los elementos (marcados y sin marcar) de la lista de cosas "
+"por hacer."
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr "Lista de cosas por hacer {0}/{1} ({2}%)"
+
 msgid "To-fix"
 msgstr "To-fix"
 
@@ -33888,6 +34109,84 @@ msgstr "Elija una fecha de expiración para la llave:"
 msgid "Create a new signing key"
 msgstr "Crear una nueva llave para firmar"
 
+msgid "Turn lanes tagging - editor"
+msgstr "Etiquetado de carriles de viraje - editor"
+
+msgid "Turn lanes tagging - Editor"
+msgstr "Etiquetado de carriles de viraje - Editor"
+
+msgid "turn lanes tagging - editor"
+msgstr "etiquetado de carriles de viraje - editor"
+
+msgid "Turn Lanes Editor"
+msgstr "Editor de carriles de viraje"
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr "revisar la dirección correcta de la vía"
+
+msgid "Unidirectional road"
+msgstr "Carretera de una sola dirección"
+
+msgid "Build unidirectional road"
+msgstr "Construir una carretera de una sola dirección"
+
+msgid "Bidirectional road"
+msgstr "Carretera de dos direcciones"
+
+msgid "Build bidirectional road"
+msgstr "Construir una carretera de dos direcciones"
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr "Carriles de viraje preestablecidos"
+
+msgid "Recently turn lanes edits"
+msgstr "Ediciones recientes de carriles de viraje"
+
+msgid "Forward"
+msgstr "Avanzar"
+
+msgid "Both way lane"
+msgstr "Carril de ambas vías"
+
+msgid "Backward"
+msgstr "Hacia atrás"
+
+msgid "Number of backward lanes"
+msgstr "Número de vías hacia atrás"
+
+msgid "Number of forward lanes"
+msgstr "Número de vías hacia adelante"
+
+msgid "Both way"
+msgstr "Ambas vías"
+
+msgid "Number of lanes"
+msgstr "Número de carriles"
+
+msgid "Directional"
+msgstr "Direccional"
+
+msgid "Turn lanes"
+msgstr "Carriles de viraje"
+
 msgid "No such lane."
 msgstr "No hay tal carril."
 
@@ -34870,9 +35169,6 @@ msgstr "Encontrar primitivas con esas etiquetas"
 msgid "Multitag Background: highlight"
 msgstr "Multietiquetado de fondo: visible"
 
-msgid "Replace Geometry"
-msgstr "Reemplazar geometría"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Reemplace la geometría del objeto seleccionado con una nueva"
 
@@ -35093,15 +35389,9 @@ msgstr "Iniciar/pausar la reproducción del vídeo"
 msgid "Video: {0}"
 msgstr "Vídeo: {0}"
 
-msgid "Backward"
-msgstr "Hacia atrás"
-
 msgid "jumps n sec back"
 msgstr "ir n segundos atrás"
 
-msgid "Forward"
-msgstr "Avanzar"
-
 msgid "jumps n sec forward"
 msgstr "salta n segundos adelante"
 
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 8ede06c..2392c84 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2016-01-02 11:25+0000\n"
 "Last-Translator: AivoK <aivo.kuhlberg at hot.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:49+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:42+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: et\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -209,18 +209,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Lisa  aluskaart {0}"
 
-msgid "Error"
-msgstr "Viga"
-
-msgid "Select image format for WMS layer"
-msgstr "Vali WMS kihi pildivorming"
-
-msgid "Select WMS layers"
-msgstr "Vali WMS-kihid"
-
-msgid "Add layers"
-msgstr "Lisa kihte"
-
 msgid "Invalid service URL."
 msgstr "Vigane teenindus-URL"
 
@@ -233,6 +221,18 @@ msgstr "WMS-kihtide loetelu allalaadimine ebaõnnestus."
 msgid "Could not parse WMS layer list."
 msgstr ""
 
+msgid "Error"
+msgstr "Viga"
+
+msgid "Select image format for WMS layer"
+msgstr "Vali WMS kihi pildivorming"
+
+msgid "Select WMS layers"
+msgstr "Vali WMS-kihid"
+
+msgid "Add layers"
+msgstr "Lisa kihte"
+
 msgid "Add Node..."
 msgstr "Lisa sõlm..."
 
@@ -3367,9 +3367,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3771,12 +3768,12 @@ msgstr ""
 msgid "House number without street"
 msgstr "Maja number ilma tänavata"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Maja number ''{0}'' duplikaat"
-
 msgid "Duplicate house numbers"
 msgstr "Maja numbrid korduvad"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Maja number ''{0}'' duplikaat"
+
 msgid "Multiple street names in relation"
 msgstr ""
 
@@ -3811,6 +3808,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Rannik vastupidises suunas: maa ei asu vasakul"
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3820,6 +3820,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3856,6 +3859,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4074,6 +4083,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4284,30 +4299,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4551,9 +4566,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Rannik vastupidises suunas: maa ei asu vasakul"
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5074,9 +5086,6 @@ msgstr "Kursori asukoha geograafiline pikkuskraad"
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "Kiht ei ole nimistus."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6501,6 +6510,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objekti tüüp:"
 
@@ -6741,6 +6753,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr "Laadi alla serverist valitud muutuskogumite sisu"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Minu muutuskogumid"
 
@@ -8042,9 +8062,6 @@ msgstr "Sisesta otsitava koha nimi"
 msgid "Areas around places"
 msgstr "Alad asulate ümber"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer exception, arvatavasti mõned puuduvad sildid (tag)."
-
 msgid "Search ..."
 msgstr "Otsi..."
 
@@ -8620,6 +8637,9 @@ msgstr "Muudatused on salvestamata - kas salvestada/laadida üles?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Muudatused on salvestamata - kas salvestada/laadida üles?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Muudetud kihtide üleslaadimine ja salvestamine...."
 
@@ -8672,6 +8692,12 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "Välju JOSMist muudatusi salvestamata. Salvestamata muudatused lähevad kaotsi."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8686,6 +8712,12 @@ msgstr ""
 "Välju JOSMist muudatusi salvestades. Salvestamata muudatused laaditakse üles "
 "või salvestatakse."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Enne kustutamist tee midagi"
 
@@ -10774,6 +10806,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Kuva allalaaditud andmete piire"
 
@@ -12885,6 +12920,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "NMEA impordi viga!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Null pointer exception, arvatavasti mõned puuduvad sildid (tag)."
+
 msgid "Note Files"
 msgstr ""
 
@@ -13248,6 +13286,9 @@ msgstr "Andmete üleslaadimine..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14929,6 +14970,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15040,7 +15084,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15219,6 +15266,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15513,18 +15563,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15534,6 +15572,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15666,6 +15707,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -16033,6 +16077,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16149,6 +16196,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Aitab WMS kujutisi vektoriseerida"
 
@@ -16351,6 +16401,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16373,6 +16428,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin OSM andmete digitaalseks allkirjastamiseks"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16531,6 +16589,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17851,6 +17913,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Koolmekoht"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Teed"
 
@@ -19470,6 +19535,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr "Ruleerimistee"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Kopteriväljak"
 
@@ -20140,11 +20208,11 @@ msgstr "Punkti number"
 msgid "Point Name"
 msgstr "Punkti nimi"
 
-msgid "Phone Number"
-msgstr "Telefoninumber"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Kasuta riigikoodi, näiteks +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -20158,6 +20226,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Telefoninumber"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -21027,6 +21101,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -21111,6 +21189,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Korruseid"
 
@@ -23316,7 +23398,13 @@ msgstr "Looduskaitseala"
 msgid "Scree"
 msgstr "Klibu, rusukalle"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23983,16 +24071,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -24001,18 +24083,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24025,18 +24095,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24229,9 +24287,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24241,6 +24310,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24256,39 +24331,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24307,9 +24367,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24364,10 +24433,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24383,7 +24458,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24428,7 +24503,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24462,6 +24537,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24480,6 +24558,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24570,10 +24651,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24819,6 +24903,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25157,3283 +25262,3320 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
-msgstr "Redigeeri lahtiolekuaegasid"
-
-msgid "Edit time-tag of selected element in a graphical interface"
-msgstr "Redigeeri valitud elemendi ajasilti graafilisel liidesel"
+msgid "Join/unjoin pictures"
+msgstr ""
 
-msgid "edit existing tag"
-msgstr "redigeeri olemasolevat silti"
+msgid "Join Mapillary pictures"
+msgstr ""
 
-msgid "edit new tag"
-msgstr "redigeeri uut silti"
+msgid "Submit changeset"
+msgstr ""
 
-msgid "Display clock in 12h mode."
-msgstr "Aega kuvatakse 12h režiimis"
+msgid "Submit the current changeset"
+msgstr ""
 
-msgid "Choose key"
-msgstr "Vali võti"
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
 
-msgid "apply {0}"
-msgstr "rakenda {0}"
+msgid "Upload pictures"
+msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "Info: {0}"
-msgstr "Info: {0}"
+msgid "Upload pictures."
+msgstr ""
 
-msgid "Correct the value manually and than press Enter."
-msgstr "Paranda väärtus käsitsi ja seejärel vajuta Enter."
+msgid "Walk mode"
+msgstr ""
 
-msgid "Error in timeformat"
-msgstr "Viga ajavormingus"
+msgid "Start walk mode"
+msgstr ""
 
-msgid "open end"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "View in website"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Edit on website"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Submit"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export all images"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
-msgstr "Käepärased aadresside interpoleerimise funktsioonid"
+msgid "Export selected sequence"
+msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Odd"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Even"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Explore"
 msgstr ""
 
-msgid "Numeric"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Actual"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Estimate"
+msgid "Give way"
 msgstr ""
 
-msgid "Potential"
+msgid "No entry"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Increment:"
+msgid "No parking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Ending #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "No turn"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Years"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Months"
 msgstr ""
 
-msgid "City:"
+msgid "Days"
 msgstr ""
 
-msgid "State:"
+msgid "Imported images"
 msgstr ""
 
-msgid "Post Code:"
-msgstr "Sihtnumber:"
+msgid "Mapillary filter"
+msgstr ""
 
-msgid "Country:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Full Address:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jump to blue"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pause"
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Login"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Logout"
 msgstr ""
 
-msgid "Length preserved"
+msgid "Download mode"
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Align with:"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid "I''m ready!"
-msgstr "Olen valmis!"
+msgid "Delete after upload"
+msgstr ""
 
-msgid "AlignWays Tips"
-msgstr "AlignWays nõuanded"
+msgid "Wait for full quality pictures"
+msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Follow selected image"
 msgstr ""
 
-msgid "Align Ways mode"
+msgid "Go forward"
 msgstr ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parameeter ''{0}'' ei tohi olla tühi"
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays aitab "
-"sul\n"
-"joondada kaks joone segmenti. See võib olla kasulik näiteks, kui joonistad\n"
-"hoonet ja soovid, et selle külg oleks paralleelne tänava või teega.<br>\n"
-"<br>\n"
-"Enne alustamist võid abi saada mõningatest nõuannetest:\n"
-"</p>\n"
-"</html>\n"
-"\n"
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
-msgstr "Ära näita seda enam"
+msgid "You have successfully uploaded {0} images to mapillary.com"
+msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
-msgstr "hoone aadress"
+msgid "The image key must not be null here!"
+msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
-msgstr "Maja number:"
+msgid "NanoLog"
+msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
+msgstr "Redigeeri lahtiolekuaegasid"
+
+msgid "Edit time-tag of selected element in a graphical interface"
+msgstr "Redigeeri valitud elemendi ajasilti graafilisel liidesel"
+
+msgid "edit existing tag"
+msgstr "redigeeri olemasolevat silti"
+
+msgid "edit new tag"
+msgstr "redigeeri uut silti"
+
+msgid "Display clock in 12h mode."
+msgstr "Aega kuvatakse 12h režiimis"
+
+msgid "Choose key"
+msgstr "Vali võti"
+
+msgid "apply {0}"
+msgstr "rakenda {0}"
+
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Info: {0}"
+msgstr "Info: {0}"
+
+msgid "Correct the value manually and than press Enter."
+msgstr "Paranda väärtus käsitsi ja seejärel vajuta Enter."
+
+msgid "Error in timeformat"
+msgstr "Viga ajavormingus"
+
+msgid "open end"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "OsmInspector"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Handy Address Interpolation Functions"
+msgstr "Käepärased aadresside interpoleerimise funktsioonid"
+
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Odd"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Even"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Numeric"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Actual"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Estimate"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Potential"
 msgstr ""
 
-msgid "Debug"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Increment:"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Street Name:"
-msgstr "Tänava nimi:"
-
-msgid "Big buildings mode"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings tags:"
-msgstr "Ehitiste sildid:"
-
-msgid "Cannot place building outside of the world."
-msgstr "Hoone peab asuma Maal."
+msgid "City:"
+msgstr ""
 
-msgid "Create building"
+msgid "State:"
 msgstr ""
 
-msgid "Set buildings size"
-msgstr "Seadista hoone suurust"
+msgid "Post Code:"
+msgstr "Sihtnumber:"
 
-msgid "Use Address dialog"
+msgid "Country:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Buildings width:"
-msgstr "hoone laius"
-
-msgid "Length step:"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Draw buildings"
-msgstr "Joonista hooneid"
-
-msgid "Point on the corner of the building to start drawing"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Starting address letter must be less than ending address letter"
 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] ""
+msgid "Please enter valid number for starting address"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "on polygon"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid "Add address"
+msgid "Align Ways"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Next no"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Enter addresses"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Length preserved"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Angle preserved"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Select commune"
+msgid "I''m ready!"
+msgstr "Olen valmis!"
+
+msgid "AlignWays Tips"
+msgstr "AlignWays nõuanded"
+
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Align Ways mode"
 msgstr ""
 
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parameeter ''{0}'' ei tohi olla tühi"
+
 msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
-msgstr "Asenda esialgne taust JOSMi taustavärviga"
-
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Set background transparent."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
-msgstr "Kuva allalaaditud andmete piire"
-
-msgid "Disable image cropping during georeferencing."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays aitab "
+"sul\n"
+"joondada kaks joone segmenti. See võib olla kasulik näiteks, kui joonistad\n"
+"hoonet ja soovid, et selle külg oleks paralleelne tänava või teega.<br>\n"
+"<br>\n"
+"Enne alustamist võid abi saada mõningatest nõuannetest:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "high"
-msgstr ""
+msgid "Don''t show this again"
+msgstr "Ära näita seda enam"
 
-msgid "medium"
+msgid "What''s new..."
 msgstr ""
 
-msgid "low"
-msgstr "madal"
-
-msgid "symbol"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "parcel"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "parcel number"
+msgid "Errr..."
 msgstr ""
 
-msgid "address"
-msgstr "aadress"
-
-msgid "locality"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "section"
-msgstr ""
+msgid "Building address"
+msgstr "hoone aadress"
 
-msgid "commune"
+msgid "empty"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "skip"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
-msgstr ""
+msgid "House number:"
+msgstr "Maja number:"
 
-msgid "French cadastre WMS"
+msgid "Street:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Post code:"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Building:"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Tags:"
 msgstr ""
-"Asenda esialgne valge taustavärv JOSMi eelistustes määratud taustavärviga."
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Name:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "updated building info"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Tag Element"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tag Building"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Created area"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Layers:"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
-msgstr ""
-
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Debug"
 msgstr ""
 
-msgid "Downloading {0}"
-msgstr "Laadin alla {0}"
-
-msgid "Contacting WMS Server..."
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid "Create buildings"
+msgid "Building Generalization"
 msgstr ""
 
 msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Alert Message"
 msgstr ""
 
-msgid "Extract best fitting boundary..."
-msgstr ""
+msgid "Street Name:"
+msgstr "Tänava nimi:"
 
-msgid "Create boundary"
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Advanced settings"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
-msgstr ""
+msgid "Buildings tags:"
+msgstr "Ehitiste sildid:"
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
-msgstr ""
+msgid "Cannot place building outside of the world."
+msgstr "Hoone peab asuma Maal."
 
-msgid "Extract commune boundary"
+msgid "Create building"
 msgstr ""
 
-msgid "Only on vectorized layers"
-msgstr ""
+msgid "Set buildings size"
+msgstr "Seadista hoone suurust"
 
-msgid "Cancel current grab"
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
-msgstr ""
+msgid "Buildings width:"
+msgstr "hoone laius"
 
-msgid "Cadastre: {0}"
+msgid "Length step:"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Grab non-georeferenced image"
-msgstr ""
+msgid "Draw buildings"
+msgstr "Joonista hooneid"
 
-msgid "Georeferencing interrupted"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
+msgid "Merge address points"
 msgstr ""
 
-msgid "{0} not allowed with the current projection"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "(optional)"
+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] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid "Change location"
+msgid "on polygon"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Add address"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "Commune"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+msgid "Next no"
 msgstr ""
 
-msgid "Departement"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Add new layer"
-msgstr "Lisa uus kiht"
+msgid "Select Feuille"
+msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid ""
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Save image as..."
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "Image cropping"
+msgid "Choose from..."
 msgstr ""
 
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
 msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Change the current projection"
 msgstr ""
 
-msgid "East"
-msgstr ""
+msgid "Replace original background by JOSM background color."
+msgstr "Asenda esialgne taust JOSMi taustavärviga"
 
-msgid "I use the mouse"
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "Click second corner for image cropping"
-msgstr ""
+msgid "Draw boundaries of downloaded data."
+msgstr "Kuva allalaaditud andmete piire"
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Reset offset"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "off"
 msgstr ""
 
-msgid "Blank Layer"
-msgstr "Tühi kiht"
-
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "25 m"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "50 m"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "100 m"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "high"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "medium"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "low"
+msgstr "madal"
+
+msgid "symbol"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "parcel"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "parcel number"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "address"
+msgstr "aadress"
+
+msgid "locality"
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "section"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "commune"
 msgstr ""
 
-msgid "Use"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "Color Scheme"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
+"Asenda esialgne valge taustavärv JOSMi eelistustes määratud taustavärviga."
 
-msgid "Delete the selected scheme from the list."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Draw a rectangle around downloaded data from WMS server."
+msgstr ""
 
-msgid "Conflation"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Matches"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Reference only"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Configure"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Conflate"
+msgid "Layers:"
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Parcels."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Centroid distance"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Generate matches"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Layer:"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Subject"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Downloading {0}"
+msgstr "Laadin alla {0}"
+
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Create buildings"
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "Empty selection"
+msgid "Create boundary"
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Requires restart"
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid "Max threads"
+msgid "Georeferencing interrupted"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
-msgstr ""
-
-msgid "Extra download area"
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
 msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid "Max download area"
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "(optional)"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Change location"
 msgstr ""
 
-msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "Split area"
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Departement"
 msgstr ""
 
-msgid "Coordinates imported: "
-msgstr "Koordinaadid imporditud: "
-
-msgid "Format errors: "
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Add new layer"
+msgstr "Lisa uus kiht"
+
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "Download along..."
+msgid "Reset cookie"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid "Image cropping"
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "East"
 msgstr ""
 
-msgid "External tool error"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Error executing the script:"
-msgstr "Viga skripti käivitamisel:"
+msgid "Set {0} Lambert coordinates"
+msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External tools"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "Are you sure?"
-msgstr "Kas oled kindel?"
+msgid "Blank Layer"
+msgstr "Tühi kiht"
 
-msgid "New tool..."
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Install"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "GeoChat"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "Login"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Use"
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Users mapping nearby:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "Private chat"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "Close tab"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Logout"
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflation"
 msgstr ""
 
-msgid "Clear log"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Matches"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Reference only"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Subject only"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Position only"
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Configure"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "A By Time"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "B By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "C By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "C By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Port:"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Configure Device"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "Generate matches"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Layer:"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "No data found on device."
+msgid "Subject"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Restore subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "Empty selection"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Class element without name"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag without key"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max threads"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Max download area"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Download strategy"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid "Split area"
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Group not yet evaluated"
-msgstr ""
+msgid "Coordinates imported: "
+msgstr "Koordinaadid imporditud: "
 
-msgid "Collection must contain at least one condition"
+msgid "Format errors: "
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "No ruleset"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download Along"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "height (m)"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "width (m)"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "length (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "weight (t)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Access class"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access types"
+msgid "External tool error"
 msgstr ""
 
-msgid "Vehicle properties"
-msgstr "Sõiduki atribuudid"
+msgid "Error executing the script:"
+msgstr "Viga skripti käivitamisel:"
 
-msgid "Road requirements"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "External tools"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "max. tracktype grade"
-msgstr ""
+msgid "Are you sure?"
+msgstr "Kas oled kindel?"
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "New tool..."
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Install"
 msgstr ""
 
-msgid "Edit access parameters"
-msgstr "Muuda juurdepääsu parameetreid"
-
-msgid "Graph View Dialog"
+msgid "Public"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "default"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "end nodes"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "incline"
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "GeoChat"
 msgstr ""
 
-msgid "Parameters:"
-msgstr "Parameetrid:"
+msgid "Open GeoChat panel"
+msgstr ""
 
-msgid "Coloring:"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Graphview"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Ruleset"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "User {0} has left"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Select directory"
-msgstr "Vali kataloog"
+msgid "Users mapping nearby:"
+msgstr ""
 
-msgid "Vehicle"
+msgid "Private chat"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Close tab"
 msgstr ""
 
-msgid "Visualization"
+msgid "Clear log"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Node color"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Arrow color"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position only"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "A By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "B By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "C By Distance"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Port:"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "Configure Device"
 msgstr ""
-"Kiirused tuleks sisestada ilma ühikuta arvuna või arvuna, millele järgneb "
-"\"mph\"."
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "Connection Error."
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "delete data after import"
 msgstr ""
 
-msgid "Imagery XML Files"
-msgstr "Aluskaardi XML-failid"
+msgid "Importing data from device."
+msgstr ""
 
-msgid "Save Imagery XML file"
-msgstr "Salvesta aluskaardi XML-fail"
+msgid "Importing data from DG100..."
+msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Connection failed."
 msgstr ""
 
 msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Open Imagery XML file"
-msgstr "Ava aluskaardi XML-fail"
-
-msgid "Calibration Layer"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "Import"
 msgstr ""
 
-msgid "Change Color"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "GPX Data"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Class element without name"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid "Get Imagery Offset..."
-msgstr "Hangi aluskaardi nihe"
-
-msgid "Download offsets for current imagery from a server"
-msgstr "Laadi jooksva aluskaardi nihe alla serverilt"
-
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Tag without key"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Offset"
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid "mm"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "cm"
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "m"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "km"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Offset Information"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "Determined right here"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "Reason"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Store Imagery Offset..."
-msgstr "Säilita aluskaardi nihe..."
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
+msgstr ""
 
 msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "File not found:\n"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "width (m)"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "length (m)"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "speed (km/h)"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "weight (t)"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "axleload (t)"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Bookmark name"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Access class"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Normal"
+msgid "Access types"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Vehicle properties"
+msgstr "Sõiduki atribuudid"
+
+msgid "Road requirements"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "Rotate 270"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Previous image"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Next image"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate image left"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Rotate right"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Display non-geotagged photos"
-msgstr "Kuva mitte-geosildistatud fotosid"
+msgid "Edit access parameters"
+msgstr "Muuda juurdepääsu parameetreid"
 
-msgid "Imported Images"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Scale:"
+msgid "default"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "end nodes"
 msgstr ""
 
-msgid "Importing..."
+msgid "incline"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Ruleset:"
+msgstr ""
+
+msgid "Parameters:"
+msgstr "Parameetrid:"
+
+msgid "Coloring:"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Graphview"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Ruleset"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
-msgstr ""
+msgid "Select directory"
+msgstr "Vali kataloog"
 
-msgid "POWER"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "Working Level"
+msgid "Visualization"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Level Name"
+msgid "Node color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark deletion"
 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>"
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose node color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview default node"
 msgstr ""
 
-msgid "GPX info mode"
+msgid "graphview default segment"
 msgstr ""
 
-msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "km/h"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
+"Kiirused tuleks sisestada ilma ühikuta arvuna või arvuna, millele järgneb "
+"\"mph\"."
 
-msgid "Track name: "
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
 msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
-msgstr ""
+msgid "Imagery XML Files"
+msgstr "Aluskaardi XML-failid"
 
-msgid "Channel-Digraph created from the active OSM-Layer"
-msgstr ""
+msgid "Save Imagery XML file"
+msgstr "Salvesta aluskaardi XML-fail"
 
-msgid "Create Channel Digraph"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "this layer is no osm data layer"
-msgstr "see kiht ei ole osm andmekiht"
-
-msgid "Converting OSM graph into Channel Digraph"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "filtering ways"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
-msgstr ""
+msgid "Open Imagery XML file"
+msgstr "Ava aluskaardi XML-fail"
 
-msgid "creating DigraphLayer"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "junctions"
+msgid "Change Color"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
 msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "Check "
-msgstr ""
+msgid "Get Imagery Offset..."
+msgstr "Hangi aluskaardi nihe"
 
-msgid "check the subset for junction properties"
-msgstr ""
+msgid "Download offsets for current imagery from a server"
+msgstr "Laadi jooksva aluskaardi nihe alla serverilt"
 
-msgid "Search "
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "Offset"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "mm"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "cm"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid "km"
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
-msgstr "Viga vahemälu kataloogi {0} loomisel"
-
-msgid "Tracing"
+msgid "Offset Information"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Imagery ID"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "east"
+msgid "Determined right here"
 msgstr ""
 
-msgid "northeast"
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "north"
+msgid "Reason"
 msgstr ""
 
-msgid "northwest"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "west"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "southwest"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "south"
+msgid "Store Imagery Offset..."
+msgstr "Säilita aluskaardi nihe..."
+
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "southeast"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "coastline"
-msgstr "rannik"
+msgid "Store imagery offset"
+msgstr ""
 
-msgid "land"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "WMS Layer"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Normal"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "Source text"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "Plugin veekogude sisestamiseks Landsati aluskaardilt."
-
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Previous image"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Next image"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "Rotate left"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Rotate right"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Display non-geotagged photos"
+msgstr "Kuva mitte-geosildistatud fotosid"
+
+msgid "Imported Images"
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
-"Omista joonele sildid ''vesi'', ''rannik'', ''maa'' või jäta märgistamata. "
-"Vaikimisi väärtus on ''vesi''."
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
-"Iga vahemälu kataloogi maksimaalne suurus baitides. Vaikeväärtus 300MB"
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
-msgstr "Andmeallika tekst. Vaikeväärtus on Landsat."
+msgid "Structure type:"
+msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "POWER"
 msgstr ""
 
-msgid "Not connected"
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Connecting"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connected"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "no name"
+msgid "Level Name"
 msgstr ""
 
-msgid "Live GPS"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "Status"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Way Info"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Speed"
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Course"
+msgid "Fitting"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "Lowest Level"
 msgstr ""
 
-msgid "Center Once"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "Highest Level"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "InfoMode"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Delete this"
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "km/h"
 msgstr ""
 
-msgid "Total images:"
+msgid "Track name: "
 msgstr ""
 
-msgid "images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "this layer is no osm data layer"
+msgstr "see kiht ei ole osm andmekiht"
+
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Export pictures"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export images"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Import pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Import local pictures"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Select pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Join mode"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Check "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures."
+msgid "Search "
 msgstr ""
 
-msgid "Walk mode"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Start walk mode"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "View in website"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Copy key"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Copy key tag"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Edit on website"
+msgid "Correct"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Wrong"
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Explore"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace way"
 msgstr ""
 
-msgid "Speed limit"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Give way"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "No entry"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Uneven road"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "No parking"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "No overtaking"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No turn"
+msgid "Error creating cache directory: {0}"
+msgstr "Viga vahemälu kataloogi {0} loomisel"
+
+msgid "Tracing"
 msgstr ""
 
-msgid "Years"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Months"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Days"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Not older than: "
+msgid "east"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "northeast"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "north"
 msgstr ""
 
-msgid "Choose signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "west"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "southwest"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "south"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "southeast"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "coastline"
+msgstr "rannik"
+
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
+msgstr "Plugin veekogude sisestamiseks Landsati aluskaardilt."
+
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
+"Omista joonele sildid ''vesi'', ''rannik'', ''maa'' või jäta märgistamata. "
+"Vaikimisi väärtus on ''vesi''."
 
-msgid "Follow selected image"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Go forward"
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
+"Iga vahemälu kataloogi maksimaalne suurus baitides. Vaikeväärtus 300MB"
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Data source text. Default is Landsat."
+msgstr "Andmeallika tekst. Vaikeväärtus on Landsat."
 
-msgid "2 images joined"
+msgid "Downloading image tile..."
 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 "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29903,6 +30045,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "raudtee"
 
@@ -29998,9 +30143,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -31012,6 +31154,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Ridaelamu"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31459,6 +31661,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Edasi"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32290,9 +32570,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32486,15 +32763,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "Edasi"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index 279cc07..65d422b 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:38+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:35+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: eu\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -209,18 +209,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Errorea"
-
-msgid "Select image format for WMS layer"
-msgstr ""
-
-msgid "Select WMS layers"
-msgstr "Hautatu WMS geruzak"
-
-msgid "Add layers"
-msgstr "Gehitu geruzak"
-
 msgid "Invalid service URL."
 msgstr ""
 
@@ -233,6 +221,18 @@ msgstr "Ezin izan da WMS geruzen zerrenda atzitu"
 msgid "Could not parse WMS layer list."
 msgstr "Ezin izan da WMS geruzen zerrenda analizatu"
 
+msgid "Error"
+msgstr "Errorea"
+
+msgid "Select image format for WMS layer"
+msgstr ""
+
+msgid "Select WMS layers"
+msgstr "Hautatu WMS geruzak"
+
+msgid "Add layers"
+msgstr "Gehitu geruzak"
+
 msgid "Add Node..."
 msgstr "Nodoa gehitu..."
 
@@ -3402,9 +3402,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3816,10 +3813,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3856,6 +3853,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr "Honek itsasertzak zuzenak direla egiaztatzen du."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Alderantzikatutako itsasertza: lurrazala ezin da ezkerretara egon"
+
 msgid "Unconnected coastline"
 msgstr "Konektatu gabeko itsasertza"
 
@@ -3865,6 +3865,9 @@ msgstr "Ordenatu gabeko itsasertza"
 msgid "Reversed coastline"
 msgstr "Alderantzikatutako itsasertza"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3901,6 +3904,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4123,6 +4132,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4333,30 +4348,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr "Lehenetsien artean ez dago balio egokirik"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4613,9 +4628,6 @@ msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 "Test honek ubide, lurrazal eta itsasertzaren norabideak egiaztatzen ditu"
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Alderantzikatutako itsasertza: lurrazala ezin da ezkerretara egon"
-
 msgid "Reversed land: land not on left side"
 msgstr "Alderantzikatutako lurrazala: lurrazala ezin da ezkerretara egon"
 
@@ -5148,9 +5160,6 @@ msgstr "Longitude geografikoa saguaren puntuan."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "Geruza hau ez dago zerrendan."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6597,6 +6606,9 @@ msgstr ""
 msgid "Sort"
 msgstr "Ordenatu"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objektu mota"
 
@@ -6837,6 +6849,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Nire aldaketa-multzoa"
 
@@ -8109,9 +8129,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr "Tokien inguruko eremua"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8675,6 +8692,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8726,6 +8746,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8738,6 +8764,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10793,6 +10825,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12874,6 +12909,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13236,6 +13274,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14885,6 +14926,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14996,7 +15040,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15175,6 +15222,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15469,18 +15519,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15490,6 +15528,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15622,6 +15663,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15992,6 +16036,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16112,6 +16159,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "WMS irudiak bektorizatzeko laguntza."
 
@@ -16326,6 +16376,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Bloke bakanetatik elkar-atxikitako etxeak sortzen ditu"
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16350,6 +16405,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16518,6 +16576,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17838,6 +17900,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Ibia"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Bideak"
 
@@ -19457,6 +19522,9 @@ msgstr "Pista"
 msgid "Taxiway"
 msgstr "Errodaje-pista"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Heliportua"
 
@@ -20127,11 +20195,11 @@ msgstr "Puntu-zenbakia"
 msgid "Point Name"
 msgstr "Puntuaren izena"
 
-msgid "Phone Number"
-msgstr "Telefono zenbakia"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Erabili nazioarteko kodea, hala nola +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Albaitaria"
@@ -20145,6 +20213,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Telefono zenbakia"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -21014,6 +21088,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -21098,6 +21176,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23303,7 +23385,13 @@ msgstr "Natura-erreserba"
 msgid "Scree"
 msgstr "Harritza"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23970,16 +24058,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23988,18 +24070,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24012,18 +24082,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24216,9 +24274,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24228,6 +24297,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24243,39 +24318,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24294,9 +24354,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24351,10 +24420,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24370,7 +24445,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24415,7 +24490,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24449,6 +24524,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24467,6 +24545,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24557,10 +24638,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24806,6 +24890,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25144,3267 +25249,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr "''{0}'' parametroa ezin da nulua izan"
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
-msgstr "Eraikinen zabalera:"
-
-msgid "Length step:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Draw buildings"
-msgstr "Eraikinak marraztu"
-
-msgid "Point on the corner of the building to start drawing"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "City:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "State:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Country:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Full Address:"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Please select a street to associate with address interpolation way"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "No address nodes inside buildings found"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "on polygon"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "Align Ways"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Change the current projection"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "Length preserved"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "Angle preserved"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Align with:"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "off"
+msgid "Parameter ''{0}'' must not be null"
+msgstr "''{0}'' parametroa ezin da nulua izan"
+
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "25 m"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "50 m"
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "100 m"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "high"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "medium"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "low"
-msgstr "baxua"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgstr ""
 
-msgid "symbol"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "section"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "commune"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "What''s new..."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Errr..."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Browser not supported."
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Building address"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "empty"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "skip"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "House number:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Street:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Post code:"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Building:"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Tags:"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Name:"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Layers:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Created area"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Error Report"
 msgstr ""
 
-msgid "Parcels."
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Custom - low resolution images"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Create buildings"
-msgstr "Eraikinak sortu"
+msgid "Thinning Iterations"
+msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "show address dialog"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Debug"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Building Generalization"
 msgstr ""
 
 msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Rotate crosshair"
+msgstr ""
+
+msgid "Advanced settings"
+msgstr ""
+
+msgid "Buildings tags:"
+msgstr ""
+
+msgid "Cannot place building outside of the world."
+msgstr ""
+
+msgid "Create building"
+msgstr ""
+
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Buildings width:"
+msgstr "Eraikinen zabalera:"
+
+msgid "Length step:"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Draw buildings"
+msgstr "Eraikinak marraztu"
+
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
+msgid "Merge address points"
 msgstr ""
 
-msgid "{0} not allowed with the current projection"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "(optional)"
+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] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid "Change location"
+msgid "on polygon"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Add address"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "Commune"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+msgid "Next no"
 msgstr ""
 
-msgid "Departement"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Select Feuille"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid ""
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Save image as..."
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "Image cropping"
+msgid "Choose from..."
 msgstr ""
 
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
 msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Change the current projection"
 msgstr ""
 
-msgid "East"
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Reset offset"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "off"
 msgstr ""
 
-msgid "Blank Layer"
-msgstr "Geruza garbia"
-
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "25 m"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "50 m"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "100 m"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "high"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "medium"
 msgstr ""
 
-msgid "Commune bbox: {0}"
-msgstr ""
+msgid "low"
+msgstr "baxua"
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "symbol"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "parcel"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "address"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "locality"
 msgstr ""
 
-msgid "Use"
-msgstr "Erabili"
+msgid "section"
+msgstr ""
 
-msgid "Please select a scheme to use."
-msgstr "Aukeratu erabiltzeko eskema bat"
+msgid "commune"
+msgstr ""
 
-msgid "Color Scheme"
-msgstr "Kolore-eskema"
+msgid "Enable automatic caching."
+msgstr ""
 
-msgid "Please select the scheme to delete."
-msgstr "Aukeratu ezabatzeko eskema bat"
+msgid "Max. cache size (in MB)"
+msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Schemes"
-msgstr "Kolore-eskemak"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
-msgid "Conflate object pair"
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Allows multiple layers stacking"
+msgstr ""
 
-msgid "Conflation"
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Matches"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Reference only"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Configure"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Conflate"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Layers:"
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Parcels."
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Layer:"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Subject"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Create buildings"
+msgstr "Eraikinak sortu"
+
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Empty selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Create boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Cadastre grab"
 msgstr ""
 
-msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Requires restart"
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Max threads"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Extra download area"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Max download area"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Download strategy"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+msgid "Change location"
 msgstr ""
 
-msgid "Split area"
-msgstr "Azalera banandu"
+msgid "Set a new location for the next request"
+msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "Add a new municipality layer"
+msgstr ""
+
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Departement"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "Download along..."
+msgid "Reset cookie"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid "Image cropping"
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "East"
 msgstr ""
 
-msgid "External tool error"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External tools"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "Are you sure?"
-msgstr "Ziur zaude?"
+msgid "Blank Layer"
+msgstr "Geruza garbia"
 
-msgid "New tool..."
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Install"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "GeoChat"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "Login"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Enable autologin"
-msgstr ""
+msgid "Use"
+msgstr "Erabili"
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please select a scheme to use."
+msgstr "Aukeratu erabiltzeko eskema bat"
 
-msgid "not logged in"
-msgstr ""
+msgid "Color Scheme"
+msgstr "Kolore-eskema"
 
-msgid "Failed to log in to GeoChat:"
+msgid "Please select the scheme to delete."
+msgstr "Aukeratu ezabatzeko eskema bat"
+
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Color Schemes"
+msgstr "Kolore-eskemak"
+
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
-msgstr ""
+msgid "Split area"
+msgstr "Azalera banandu"
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
-msgstr ""
+msgid "Are you sure?"
+msgstr "Ziur zaude?"
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29871,6 +30013,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "trenbidea"
 
@@ -29966,9 +30111,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30980,6 +31122,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31427,6 +31629,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Aurrera"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32253,9 +32533,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32449,15 +32726,9 @@ msgstr "hasi/pausatu bideoaren play-back-a"
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "Aurrera"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 4145fba..684a49d 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:20+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:02+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: fa\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -205,18 +205,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "افزودن لایه تصویری {0}"
 
-msgid "Error"
-msgstr "خطا"
-
-msgid "Select image format for WMS layer"
-msgstr "انتخاب فرمت تصویر برای لایه WMS"
-
-msgid "Select WMS layers"
-msgstr "انتخاب لایه های WMS"
-
-msgid "Add layers"
-msgstr "افزودن لایه ها"
-
 msgid "Invalid service URL."
 msgstr "آدرس سرویس نامعتبر است."
 
@@ -229,6 +217,18 @@ msgstr "فهرست لایه WMS زا نمی توان بازیابی کرد."
 msgid "Could not parse WMS layer list."
 msgstr "فهرست لایه WMS را نمی توان تجزیه کرد."
 
+msgid "Error"
+msgstr "خطا"
+
+msgid "Select image format for WMS layer"
+msgstr "انتخاب فرمت تصویر برای لایه WMS"
+
+msgid "Select WMS layers"
+msgstr "انتخاب لایه های WMS"
+
+msgid "Add layers"
+msgstr "افزودن لایه ها"
+
 msgid "Add Node..."
 msgstr "افزودن گره..."
 
@@ -3343,9 +3343,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3745,10 +3742,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3785,6 +3782,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3794,6 +3794,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3830,6 +3833,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4048,6 +4057,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4258,30 +4273,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4525,9 +4540,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5049,9 +5061,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6475,6 +6484,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "نوع شئ:"
 
@@ -6714,6 +6726,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7986,9 +8006,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8557,6 +8574,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8608,6 +8628,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8620,6 +8646,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10673,6 +10705,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12754,6 +12789,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13116,6 +13154,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14759,6 +14800,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14870,7 +14914,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15049,6 +15096,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15343,18 +15393,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15364,6 +15402,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15496,6 +15537,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15863,6 +15907,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15977,6 +16024,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16174,6 +16224,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16196,6 +16251,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16352,6 +16410,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17672,6 +17734,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19291,6 +19356,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19961,10 +20029,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19979,6 +20047,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20848,6 +20922,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20932,6 +21010,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23137,7 +23219,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23804,16 +23892,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23822,18 +23904,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23846,18 +23916,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24050,9 +24108,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24062,6 +24131,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24077,39 +24152,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24128,9 +24188,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24185,10 +24254,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24204,7 +24279,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24249,7 +24324,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24283,6 +24358,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24301,6 +24379,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24391,10 +24472,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24640,6 +24724,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24978,3267 +25083,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29700,6 +29842,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29795,9 +29940,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30809,6 +30951,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31256,6 +31458,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32082,9 +32362,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32278,15 +32555,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index a60ad6b..19dd19d 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2016-01-19 17:11+0000\n"
 "Last-Translator: Lauri Kytömaa <Unknown>\n"
 "Language-Team: Finnish <fi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:51+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:43+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: fi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -213,18 +213,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Lisää kuvataso {0}"
 
-msgid "Error"
-msgstr "Virhe"
-
-msgid "Select image format for WMS layer"
-msgstr "Valitse WMS-tason kuvaformaatti"
-
-msgid "Select WMS layers"
-msgstr "Valitse WMS-taso"
-
-msgid "Add layers"
-msgstr "Lisää tasoja"
-
 msgid "Invalid service URL."
 msgstr "Palvelun URL on virheellinen"
 
@@ -237,6 +225,18 @@ msgstr "Listaa WMS-tasoista ei saatu haettua."
 msgid "Could not parse WMS layer list."
 msgstr "WMS-palvelun karttatasojen listaaminen epäonnistui."
 
+msgid "Error"
+msgstr "Virhe"
+
+msgid "Select image format for WMS layer"
+msgstr "Valitse WMS-tason kuvaformaatti"
+
+msgid "Select WMS layers"
+msgstr "Valitse WMS-taso"
+
+msgid "Add layers"
+msgstr "Lisää tasoja"
+
 msgid "Add Node..."
 msgstr "Lisää piste..."
 
@@ -3517,9 +3517,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Saatu getCapabilities-tiedosto ei määrittele tasoja: {0}"
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3939,12 +3936,12 @@ msgstr ""
 msgid "House number without street"
 msgstr "Osoitenumero määritetty ilman tietoa tiestä"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Talonumero ''{0}'' löytyi useamman kerran relaatiosta"
-
 msgid "Duplicate house numbers"
 msgstr "Talonumero toistuu useamman kerran"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Talonumero ''{0}'' löytyi useamman kerran relaatiosta"
+
 msgid "Multiple street names in relation"
 msgstr "AssociatedStreet-relaation jäsenissä on erinimisiä teitä"
 
@@ -3979,6 +3976,9 @@ msgstr "Rantaviivat"
 msgid "This test checks that coastlines are correct."
 msgstr "Tämä tarkistaa, että rantaviivat ovat oikein."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Rantaviiva väärin päin: maan pitää olla polun vasemmalla puolella."
+
 msgid "Unconnected coastline"
 msgstr "Yhdistämätön rantaviiva"
 
@@ -3988,6 +3988,9 @@ msgstr "Järjestämätön rantaviiva"
 msgid "Reversed coastline"
 msgstr "Käännetty rantaviiva"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -4026,6 +4029,12 @@ msgstr "Risteävät rajat"
 msgid "Crossing barriers"
 msgstr "Risteävät esteet"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4260,6 +4269,12 @@ msgstr "Monimonikulmion jäsenellä ei ole käyttökelpoista roolia"
 msgid "Non-Way in multipolygon"
 msgstr "Muu kuin polku monimonikulmiossa"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Puuttuva name:* -kieliversio"
 
@@ -4481,30 +4496,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Avaimen arvossa HTML-entiteettikoodeja"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Avain ''{0}'' hyvin lähellä avainta ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Kirjoitusvirhe tagin avaimessa"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Avainta \"{0}\" ei ole esivalinnoissa."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Avain ''{0}'' hyvin lähellä avainta ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Esivalinnoissa ei ole ominaisuuden avainta."
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Arvo ''{0}'' avaimelle ''{1}'' hyvin lähellä arvoa ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Avainta \"{0}\" ei ole esivalinnoissa."
 
 msgid "Misspelled property value"
 msgstr "Kirjoitusvirhe tagin arvossa"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Esivalinnoissa ei avaimella \"{1}\" ole arvoa \"{0}\"."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Arvo ''{0}'' avaimelle ''{1}'' hyvin lähellä arvoa ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Esivalinnoissa ei ole ominaisuuden arvoa."
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Esivalinnoissa ei avaimella \"{1}\" ole arvoa \"{0}\"."
+
 msgid "FIXMES"
 msgstr "FIXME-avain (korjattavia karttakohteita)"
 
@@ -4758,9 +4773,6 @@ msgstr ""
 "Tarkistaa vesi-, maa- ja rantaviiva-polkujen suunnan (vesi kulkusuunnassa "
 "oikealla)."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Rantaviiva väärin päin: maan pitää olla polun vasemmalla puolella."
-
 msgid "Reversed land: land not on left side"
 msgstr "Maa-alue väärin päin: maan pitää olla polun vasemmalla puolella."
 
@@ -5294,9 +5306,6 @@ msgstr "Pituusaste osoittimen kohdalla."
 msgid "System of measurement changed to {0}"
 msgstr "Mittayksiköt vaihdettiin, uusi järjestelmä on: {0}"
 
-msgid "Layer not in list."
-msgstr "taso ei ole listassa."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6784,6 +6793,9 @@ msgstr "Järjestä karttailmoitukset"
 msgid "Sort"
 msgstr "Järjestä"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objektin tyyppi:"
 
@@ -7025,6 +7037,14 @@ msgstr "Lataa muutoskokoelman sisältö"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Lataa valittujen muutoskokoelmien sisältö palvelimelta"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Omat muutoskokoelmani"
 
@@ -8397,9 +8417,6 @@ msgstr "Anna etsittävän paikan tai muun karttakohteen nimi"
 msgid "Areas around places"
 msgstr "Hae nimellä/osoitteella"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr "Etsi ..."
 
@@ -9032,6 +9049,9 @@ msgstr ""
 "Tallentamattomia muutoksia - Tallenna tai lähetä serverille ennen "
 "poistamista?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Lähetetään ja tallennetaan muutettuja tasoja ..."
 
@@ -9099,6 +9119,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Sulje JOSM tallentamatta. Tallentamattomat muutokset häviävät."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Poista suoraan"
 
@@ -9113,6 +9139,12 @@ msgstr ""
 "Sulje JOSM ja tallenna. Tallentamattomat muutokset lähetetään palvelimelle "
 "ja/tai tallennetaan."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Suorita valitut toimet ja poista taso"
 
@@ -11258,6 +11290,9 @@ msgstr "Piirrä yksisuuntaisuusnuolet"
 msgid "Draw segment order numbers"
 msgstr "Piirrä segmenttien järjestysnumerot"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Piirrä ladatun alueen rajat"
 
@@ -13466,6 +13501,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "NMEA-tuonti epäonnistui"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13838,6 +13876,9 @@ msgstr "Lähetetään dataa..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Havaittiin OSM-objektille odottamaton tunniste \"0\"."
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -15553,6 +15594,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15664,7 +15708,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15843,6 +15890,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16137,18 +16187,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -16158,6 +16196,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -16290,6 +16331,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -16665,6 +16709,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Lataa karttatiedot OSM:sta halutun polun varrelta"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16782,6 +16829,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "WMS-taustatasojen vektorointiin"
 
@@ -16998,6 +17048,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17020,6 +17075,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17184,6 +17242,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -18506,6 +18568,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Kahluupaikka"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Polut"
 
@@ -20125,6 +20190,9 @@ msgstr "Kiitorata"
 msgid "Taxiway"
 msgstr "Rullaustie"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Helikopterikenttä"
 
@@ -20795,10 +20863,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
-msgstr "Puhelinnumero"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -20813,6 +20881,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr "Automaattinen defibrillaattori"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Puhelinnumero"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -21682,6 +21756,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -21766,6 +21844,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23971,7 +24053,13 @@ msgstr "Luonnonsuojelualue"
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -24639,16 +24727,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -24657,18 +24739,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24681,18 +24751,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24885,9 +24943,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr "Sama arvo avaimilla {0} ja {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} ilman tagia {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} ilman joko tagia {1} tai {2}"
 
@@ -24897,6 +24966,12 @@ msgstr "{0} ilman jotain tageista {1}, {2} tai {3}"
 msgid "{0} together with {1}"
 msgstr "{0} samassa kohteessa {1}:n kanssa"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24912,39 +24987,24 @@ msgstr "{0} samassa kohteessa {1}:n kanssa ja arvot ristiriidassa"
 msgid "{0} on suspicious object"
 msgstr "Avain {0} yllättävällä karttakohteella"
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr "Sama arvo avaimilla {0} ja {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Sama arvo avaimilla {0}, {1} ja {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} ja {1} samassa kohteessa {2}:n kanssa ja arvot ristiriidassa"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Epäilyttävä tagiyhdistelmä: {0} and {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24963,9 +25023,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} ei ole enää suositeltu merkintätapa"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -25028,10 +25097,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr "{0} käyttöä ei suositella. Käännä polun suunta (Työkalut-valikossa)."
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -25047,7 +25122,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25092,7 +25167,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -25126,6 +25201,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -25144,6 +25222,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -25238,10 +25319,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr "{0} on tarpeeton"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} on tarpeeton kun {1}"
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -25497,6 +25581,27 @@ msgstr "Lähetetään GPX-jälkeä"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Lähettää jäljet openstreetmap.org:iin"
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25837,6 +25942,403 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
+msgid "Mapillary Images"
+msgstr "Mapillary-kuvat"
+
+msgid "Mapillary layer"
+msgstr "Mapillary-taso"
+
+msgid "Total images:"
+msgstr "Kuvia yhteensä:"
+
+msgid "images"
+msgstr "kuvaa"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Luo Mapillary-taso"
+
+msgid "Start Mapillary layer"
+msgstr ""
+
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr ""
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr ""
 
@@ -27507,9 +28009,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Login"
-msgstr ""
-
 msgid "Enable autologin"
 msgstr ""
 
@@ -27542,9 +28041,6 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Logout"
-msgstr ""
-
 msgid "Clear log"
 msgstr ""
 
@@ -28099,9 +28595,6 @@ msgstr ""
 msgid "cm"
 msgstr ""
 
-msgid "m"
-msgstr ""
-
 msgid "km"
 msgstr ""
 
@@ -28279,21 +28772,9 @@ msgstr "Tuodut kuvat"
 msgid "Import vector graphics"
 msgstr ""
 
-msgid "Scale:"
-msgstr ""
-
-msgid "unit(s) = "
-msgstr ""
-
-msgid "Importing..."
-msgstr ""
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -28498,6 +28979,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Korvaa geometria"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -28752,400 +29288,6 @@ msgstr ""
 msgid "Missing input data"
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr "Mapillary-kuvat"
-
-msgid "Mapillary layer"
-msgstr "Mapillary-taso"
-
-msgid "Total images:"
-msgstr "Kuvia yhteensä:"
-
-msgid "images"
-msgstr "kuvaa"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Luo Mapillary-taso"
-
-msgid "Start Mapillary layer"
-msgstr ""
-
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Mitatut arvot"
 
@@ -30624,6 +30766,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -30719,9 +30864,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -31737,6 +31879,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -32189,6 +32391,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Eteenpäin"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -33052,9 +33332,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Korvaa geometria"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Korvaa valitun objektin geometrian uudella"
 
@@ -33255,15 +33532,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "Eteenpäin"
-
 msgid "jumps n sec forward"
 msgstr "siirtyy n sekuntia eteenpäin"
 
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index c0cd21e..0477fb7 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:52+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:18+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: fil\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 98fb729..599ace2 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:50+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:42+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -203,28 +203,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Feilur"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Feilur"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3277,9 +3277,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3681,10 +3678,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3721,6 +3718,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3730,6 +3730,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3766,6 +3769,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3984,6 +3993,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4194,30 +4209,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4461,9 +4476,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4984,9 +4996,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6406,6 +6415,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6645,6 +6657,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7917,9 +7937,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8483,6 +8500,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8534,6 +8554,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8546,6 +8572,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10599,6 +10631,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12680,6 +12715,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13042,6 +13080,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14685,6 +14726,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14796,7 +14840,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14975,6 +15022,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15269,18 +15319,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15290,6 +15328,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15422,6 +15463,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15789,6 +15833,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15903,6 +15950,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16100,6 +16150,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16122,6 +16177,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16278,6 +16336,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17598,6 +17660,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19217,6 +19282,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19887,10 +19955,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19905,6 +19973,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20774,6 +20848,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20858,6 +20936,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23063,7 +23145,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23730,16 +23818,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23748,18 +23830,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23772,18 +23842,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23976,9 +24034,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23988,6 +24057,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24003,39 +24078,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24054,9 +24114,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24111,10 +24180,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24130,7 +24205,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24175,7 +24250,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24209,6 +24284,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24227,6 +24305,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24317,10 +24398,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24566,6 +24650,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24904,3267 +25009,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29626,6 +29768,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29721,9 +29866,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30735,6 +30877,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31182,6 +31384,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32008,9 +32288,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32204,15 +32481,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index f055337..0eaed9d 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-09 15:32+0000\n"
-"Last-Translator: Don-vip <Unknown>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-03 13:35+0000\n"
+"Last-Translator: Simon Legner <Unknown>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:52+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:44+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: fr\n"
 "X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
 
@@ -213,18 +213,6 @@ msgstr "Sélectionner un objet"
 msgid "Add imagery layer {0}"
 msgstr "Ajouter le calque d’imagerie {0}"
 
-msgid "Error"
-msgstr "Erreur"
-
-msgid "Select image format for WMS layer"
-msgstr "Sélectionnez le format d''image pour le calque WMS"
-
-msgid "Select WMS layers"
-msgstr "Sélectionner les calques WMS"
-
-msgid "Add layers"
-msgstr "Ajouter des couches"
-
 msgid "Invalid service URL."
 msgstr "L’adresse web n’est pas valide."
 
@@ -237,6 +225,18 @@ msgstr "Impossible d’obtenir la liste des calques WMS."
 msgid "Could not parse WMS layer list."
 msgstr "Impossible d’analyser la liste des calques WMS."
 
+msgid "Error"
+msgstr "Erreur"
+
+msgid "Select image format for WMS layer"
+msgstr "Sélectionnez le format d''image pour le calque WMS"
+
+msgid "Select WMS layers"
+msgstr "Sélectionner les calques WMS"
+
+msgid "Add layers"
+msgstr "Ajouter des couches"
+
 msgid "Add Node..."
 msgstr "Ajouter un nœud"
 
@@ -3595,9 +3595,6 @@ msgstr "Identifiant de jeu de matrice"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Aucun calque défini par le document getCapabilities : {0}"
 
-msgid "No layer selected"
-msgstr "Aucun calque sélectionné"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4047,12 +4044,12 @@ msgstr "plusieurs relations associatedStreet"
 msgid "House number without street"
 msgstr "Numéro sans nom de rue"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Numéro de maison ''{0}'' en double"
-
 msgid "Duplicate house numbers"
 msgstr "Numéros dupliqués"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Numéro de maison ''{0}'' en double"
+
 msgid "Multiple street names in relation"
 msgstr "Plusieurs nom de rues dans la relation"
 
@@ -4090,6 +4087,10 @@ msgstr "Côtes"
 msgid "This test checks that coastlines are correct."
 msgstr "Vérifier si les lignes de côte sont correctes."
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+"Ligne de côte inversée : la terre n’est pas sur le coté gauche du chemin"
+
 msgid "Unconnected coastline"
 msgstr "Littoral non connecté"
 
@@ -4099,6 +4100,9 @@ msgstr "Ligne de côte désordonnée"
 msgid "Reversed coastline"
 msgstr "Ligne de côte inversée"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "Clés conditionelles"
 
@@ -4135,6 +4139,12 @@ msgstr "Chevauchement de zones"
 msgid "Crossing barriers"
 msgstr "Barrières de passage à niveaux"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4367,6 +4377,12 @@ msgstr "Membre du multipolygone sans rôle utile"
 msgid "Non-Way in multipolygon"
 msgstr "Non-chemin dans le multipolygone"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Traduction name:* manquante"
 
@@ -4593,31 +4609,31 @@ msgstr "Les valeurs de propriété contiennent plusieurs espaces"
 msgid "Property values contain HTML entity"
 msgstr "Les valeurs contiennent du code HTML"
 
+msgid "Misspelled property key"
+msgstr "Clé d''attribut mal orthographiée"
+
 msgid "Key ''{0}'' looks like ''{1}''."
 msgstr "La clé ''{0}'' ressemble à ''{1}''."
 
-msgid "Misspelled property key"
-msgstr "Clé d''attribut mal orthographiée"
+msgid "Presets do not contain property key"
+msgstr "Le  modèle des attributs ne contient pas de clé"
 
 msgid "Key ''{0}'' not in presets."
 msgstr "La clé « {0} » est absente du modèle des attributs."
 
-msgid "Presets do not contain property key"
-msgstr "Le  modèle des attributs ne contient pas de clé"
+msgid "Misspelled property value"
+msgstr "Valeur de la propriété mal orthographiée"
 
 msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr "La valeur \"{0}\" pour la clé \"{1}\" ressemble à \"{2}\"."
 
-msgid "Misspelled property value"
-msgstr "Valeur de la propriété mal orthographiée"
+msgid "Presets do not contain property value"
+msgstr "Le modèle d’attributs ne contient pas de valeur"
 
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 "La valeur « {0} » est absente du modèle des attributs pour la clé ·« {1} »."
 
-msgid "Presets do not contain property value"
-msgstr "Le modèle d’attributs ne contient pas de valeur"
-
 msgid "FIXMES"
 msgstr "FIXME"
 
@@ -4868,10 +4884,6 @@ msgstr "Chemins incorrectement ordonnés"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Vérifier l’orientation de l’eau, de la terre et des lignes de côte."
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-"Ligne de côte inversée : la terre n’est pas sur le coté gauche du chemin"
-
 msgid "Reversed land: land not on left side"
 msgstr "Terre inversée : la terre n’est pas sur le coté gauche du chemin"
 
@@ -5433,9 +5445,6 @@ msgstr "Longitude"
 msgid "System of measurement changed to {0}"
 msgstr "Le système de mesure à été changé en {0}"
 
-msgid "Layer not in list."
-msgstr "Le calque n’est pas dans la liste."
-
 msgid "Default (open, closed, new)"
 msgstr "Défaut (ouvert, fermé, nouveau)"
 
@@ -6986,6 +6995,9 @@ msgstr "Trier les notes"
 msgid "Sort"
 msgstr "Trier"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Type :"
 
@@ -7239,6 +7251,14 @@ msgstr "Télécharger son contenu"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Télécharger le contenu du groupe de modifications"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Mes groupes de modifications"
 
@@ -8636,9 +8656,6 @@ msgstr "saisir le nom du lieu à rechercher"
 msgid "Areas around places"
 msgstr "Rechercher un lieu"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Exception NullPointer. Des attributs sont probablement manquants."
-
 msgid "Search ..."
 msgstr "Rechercher"
 
@@ -9296,6 +9313,9 @@ msgstr ""
 "Il y a des modifications non enregistrées. Voulez-vous les enregistrer / "
 "envoyer avant de supprimer ?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Envoi et enregistrement des calques modifiés…"
 
@@ -9367,6 +9387,12 @@ msgstr ""
 "Quitter JOSM sans enregistrer (les modifications non enregistées seront "
 "perdues)"
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Supprimer maintenant !"
 
@@ -9383,6 +9409,12 @@ msgstr ""
 "Quitter JOSM en sauvegardant (les modifications seront envoyées et/ou "
 "sauvées)"
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Effectuer les actions avant de supprimer"
 
@@ -11715,6 +11747,9 @@ msgstr "Dessiner les flèches des sens uniques"
 msgid "Draw segment order numbers"
 msgstr "Afficher l’ordre des segments"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Afficher les limites des données téléchargées"
 
@@ -14020,6 +14055,9 @@ msgstr "Import NMEA réussi:"
 msgid "NMEA import failure!"
 msgstr "L’importation des trames NMEA a échoué !"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Exception NullPointer. Des attributs sont probablement manquants."
+
 msgid "Note Files"
 msgstr "Fichiers de notes"
 
@@ -14450,6 +14488,9 @@ msgstr "Téléchargement des données…"
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Un identifiant 0 inattendu a été trouvé sur un objet OSM"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "Téléchargement des données..."
 
@@ -15817,13 +15858,13 @@ msgid ""
 msgstr ""
 
 msgid "Debug information"
-msgstr ""
+msgstr "Information de débogage"
 
 msgid "Manually report at:"
 msgstr ""
 
 msgid "Is JOSM up to date?"
-msgstr ""
+msgstr "JOSM est-il à jour ?"
 
 msgid "Send bug report"
 msgstr ""
@@ -15855,7 +15896,7 @@ msgstr ""
 "l''erreur à l''adresse :"
 
 msgid "Include the system status report."
-msgstr ""
+msgstr "Joindre un rapport d''état du système."
 
 msgid "Include information about the data you were working on."
 msgstr ""
@@ -16383,6 +16424,9 @@ msgstr "Tiris : DGM (modèle de terrain)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris : DOM (modèle de surface)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienne : Mehrzweckkarte (cadre général)"
 
@@ -16494,8 +16538,11 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16677,6 +16724,9 @@ msgstr "Imagerie drone 2014 (Haïti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drone Imagery Canaan(Haiti) novembre 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16971,18 +17021,6 @@ msgstr "Freemap.sk Randonnée cycliste"
 msgid "Freemap.sk Ski"
 msgstr "Ski Freemap.sk"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Carte de Katastrálna, Slovénie (KaPor, 04-2010)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Carte de Katastrálna, Slovénie (KaPor, 05-2011)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovaquie EEA GMES Atlas urbain"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovaquie EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Cartes historiques de la Slovaquie"
 
@@ -16992,6 +17030,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Afrique du Sud CD:NGI Aérien"
 
@@ -17124,6 +17165,9 @@ msgstr "Service forestier des routes (États-Unis)"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophoto 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -17525,6 +17569,9 @@ msgstr "Charge directement les traces GPS du calque vers le serveur OSM."
 msgid "Downloads OSM data along a way"
 msgstr "Télécharge les données OSM le long d’un chemin"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17675,6 +17722,9 @@ msgstr ""
 "Crée un digraphe de canaux et vérifie un sous-ensemble de canaux s’il s’agit "
 "d’une jonction ou cherche des jonctions dans un sous-ensemble de canaux"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Aide à vectoriser des images WMS."
 
@@ -17928,6 +17978,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Créer des maisons mitoyennes depuis des blocs entiers."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17959,6 +18014,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Permet de signer numériquement les données OSM."
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18130,6 +18188,10 @@ msgid "No wheeled vehicle"
 msgstr "Aucun véhicule à roue"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "Terrain"
 
@@ -19459,6 +19521,9 @@ msgstr "construction"
 msgid "Ford"
 msgstr "Gué"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Chemins"
 
@@ -21107,6 +21172,9 @@ msgstr "Piste"
 msgid "Taxiway"
 msgstr "Voie de circulation"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Héliport"
 
@@ -21165,7 +21233,7 @@ msgid "Guest House/Bed & Breakfast"
 msgstr "Chambre d’hôtes/Bed & Breakfast"
 
 msgid "Chalet"
-msgstr "Chalet"
+msgstr "Meublé de tourisme"
 
 msgid "Hostel"
 msgstr "Auberge de jeunesse"
@@ -21782,11 +21850,11 @@ msgstr "Numéro du point"
 msgid "Point Name"
 msgstr "Nom du point"
 
-msgid "Phone Number"
-msgstr "Numéro de téléphone"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Utiliser un code international, par exemple +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Cabinet vétérinaire"
@@ -21800,6 +21868,12 @@ msgstr "Garage d''ambulance"
 msgid "Automated Defibrillator"
 msgstr "Défibrillateur automatique"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Numéro de téléphone"
+
 msgid "Located inside a building?"
 msgstr "Situé à lʼintérieur dʼun batiment?"
 
@@ -22669,6 +22743,10 @@ msgid "university"
 msgstr "université"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "hôpital"
 
@@ -22753,6 +22831,10 @@ msgid "public"
 msgstr "bâtiment public"
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Niveaux"
 
@@ -24972,8 +25054,14 @@ msgstr "Réserve naturelle"
 msgid "Scree"
 msgstr "Éboulis"
 
-msgid "An accumulation of loose rocks."
-msgstr "Une accumulation de roches fragmentées."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "Talus"
@@ -25656,17 +25744,11 @@ msgstr "Itinéraires"
 msgid "Bicycle Route"
 msgstr "Itinéraire cycliste"
 
-msgid "icn"
-msgstr "Réseau cycliste international"
-
-msgid "ncn"
-msgstr "Réseau cycliste national"
-
-msgid "rcn"
-msgstr "Réseau cycliste régional"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "Réseau cycliste local"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Itinéraire de vélo tout-terrain (VTT)"
@@ -25674,18 +25756,6 @@ msgstr "Itinéraire de vélo tout-terrain (VTT)"
 msgid "Hiking Route"
 msgstr "Itinéraire pédestre"
 
-msgid "iwn"
-msgstr "Réseau de randonnée pédestre international"
-
-msgid "nwn"
-msgstr "Réseau de randonnée pédestre national"
-
-msgid "rwn"
-msgstr "Réseau de randonnée pédestre régional"
-
-msgid "lwn"
-msgstr "Réseau de randonnée pédestre local"
-
 msgid "infrastructure"
 msgstr "infrastructure"
 
@@ -25698,18 +25768,6 @@ msgstr "Itinéraire de randonnée pédestre"
 msgid "Riding Route"
 msgstr "Itinéraire de randonnée équestre"
 
-msgid "ihn"
-msgstr "Itinéraire international"
-
-msgid "nhn"
-msgstr "Itinéraire national"
-
-msgid "rhn"
-msgstr "Itinéraire régionale"
-
-msgid "lhn"
-msgstr "Itinéraire local"
-
 msgid "Piste Route"
 msgstr "Itinéraire de piste"
 
@@ -25903,9 +25961,20 @@ msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 "Route dotée de {0}. Tagguez les numéros de rue séparément si possible."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr "Même valeur pour {0} et {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} sans {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} sans {1} ou {2}"
 
@@ -25915,6 +25984,12 @@ msgstr "{0} sans {1}, {2} ni {3}"
 msgid "{0} together with {1}"
 msgstr "{0} combiné à {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "élément incomplet : uniquement {0}"
 
@@ -25930,39 +26005,24 @@ msgstr "{0} avec {1} et valeurs conflictuelles"
 msgid "{0} on suspicious object"
 msgstr "{0} sur un objet suspicieux"
 
-msgid "restaurant without name"
-msgstr "restaurant sans nom"
-
-msgid "{0} used with {1}"
-msgstr "{0} utilisé avec {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "Eau naturelle utilisée pour une piscine"
 
 msgid "sport without physical feature"
 msgstr "sport sans équipements"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} devrait être sur le nœud où {1} et {2} se croisent"
-
 msgid "alternative name without {0}"
 msgstr "nom alternatif sans {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "usage partiel de {0} sur un chemin sans {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Même valeur pour {0} et {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Même valeur pour {0}, {1} et {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} et {1} tous deux avec {2} et valeurs conflictuelles"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Combinaison suspecte de tags : {0} et {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25981,9 +26041,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} combiné à {1} et {2}. Retirer {1} et {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} est déprécié"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' est incompréhensible, utiliser plutôt des attributs plus appropriés, "
@@ -26055,11 +26124,17 @@ msgstr "Attribut {0} non spécifique"
 msgid "Definition of {0} is unclear"
 msgstr "La définition de {0} n’est pas claire"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} est déconseillé. Utilisez la fonction Inverser le chemin du menu Outils."
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "clé avec un caractère non usuel"
 
@@ -26075,8 +26150,8 @@ msgstr "{0} est obsolète pour {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} est obsolète. A la place, utilisez {1}: préfixe de clé."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "clé douteuse (termine par un numéro): {0}"
+msgid "questionable key (ending with a number)"
+msgstr ""
 
 msgid "The key {0} has an uncommon value."
 msgstr "La clé {0} possède une valeur peu courante."
@@ -26120,8 +26195,8 @@ msgstr "Aires naturelles se chevauchant"
 msgid "Overlapping Identical Landuses"
 msgstr "Terrains identiques se chevauchant"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} doit être relié à un chemin"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "le noeud est à l’intersection d’un cours d’eau et d’un pont"
@@ -26157,6 +26232,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} devrait être sur le nœud où {1} et {2} se croisent"
+
 msgid "abbreviated street name"
 msgstr "abbréviation du nom de rue"
 
@@ -26175,6 +26253,9 @@ msgstr "route sans référence"
 msgid "temporary highway type"
 msgstr "type de route temporaire"
 
+msgid "{0} used with {1}"
+msgstr "{0} utilisé avec {1}"
+
 msgid "street name contains ss"
 msgstr "le nom de rue contient ss"
 
@@ -26275,11 +26356,14 @@ msgstr "dénomination juive inconnue"
 msgid "{0} is unnecessary"
 msgstr "{0} n’est pas nécessaire"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} est non nécessaire pour {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} ne fait pas de sens"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Nœuds dupliquant les attributs du chemin parent"
@@ -26550,6 +26634,28 @@ msgstr "Envoi de la trace GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Envoyer les traces vers openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importation…"
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+"Veuillez ouvrir ou créer un calque de données avant de faire l’importation."
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Échelle :"
+
+msgid "unit(s) = "
+msgstr "unité(s) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Afficher le profil d’élévation"
 
@@ -26908,6 +27014,407 @@ 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 "Total images:"
+msgstr "Images totales :"
+
+msgid "images"
+msgstr "images"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Créer un calque Mapillary"
+
+msgid "Start Mapillary layer"
+msgstr "Commencer un calque 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 "Select pictures"
+msgstr "Sélectionner des photos"
+
+msgid "Import pictures into sequence"
+msgstr "Importer une séquence de photos"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importer une séquence de photos dans un calque Mapillary"
+
+msgid "Join mode"
+msgstr "Mode assemblage"
+
+msgid "Join/unjoin pictures"
+msgstr "(Dés)assembler les images"
+
+msgid "Join Mapillary pictures"
+msgstr "Assembler les images Mapillary"
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr "Envoi de photographies"
+
+msgid "Upload Mapillary pictures"
+msgstr "Envoi de photographies Mapillary"
+
+msgid "Upload pictures."
+msgstr "Envoi de photographies."
+
+msgid "Walk mode"
+msgstr "Mode piéton"
+
+msgid "Start walk mode"
+msgstr "Commencer le 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 "View in website"
+msgstr "Voir sur le site"
+
+msgid "Copy key"
+msgstr "Copier la clé"
+
+msgid "Copy key tag"
+msgstr "Copier l’attribut de la clé"
+
+msgid "Edit on website"
+msgstr "Éditer sur le site web"
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+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 folder"
+msgstr "Sélectionner un dossier"
+
+msgid "Explore"
+msgstr "Explorer"
+
+msgid "Select a directory"
+msgstr "Sélectionner un répertoire"
+
+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 "Mapillary picture"
+msgstr "Image Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Ouvrir la fenêtre Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Fenêtre Mapillary"
+
+msgid "Open Mapillary main dialog"
+msgstr "Ouvrir la fenêtre Mapillary principale"
+
+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 ""
+
+msgid "Login"
+msgstr "Connexion"
+
+msgid "Logout"
+msgstr "Déconnexion"
+
+msgid "Download mode"
+msgstr "Mode téléchargement"
+
+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 "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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+
+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 ""
+
+msgid "No images found"
+msgstr "Aucune image trouvée"
+
+msgid "You have successfully uploaded {0} images to mapillary.com"
+msgstr ""
+
+msgid "Finished upload"
+msgstr "Envoi terminé"
+
+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 "Envoi en cours : {0}"
+
+msgid "The image key ''{0}'' is invalid!"
+msgstr "La clé de l''image ''{0}'' n''est pas valide!"
+
+msgid "The image key must not be null here!"
+msgstr "La clé de l''image ne doit pas être nulle!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "La séquence de clé de l''image ''{0}'' n''est pas valide!"
+
+msgid "The sequence key must not be null here!"
+msgstr "La séquence de clé de l''image ne doit pas être nulle!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28786,9 +29293,6 @@ 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"
 
@@ -28821,9 +29325,6 @@ msgstr "Chat privé"
 msgid "Close tab"
 msgstr "Fermer l''onglet"
 
-msgid "Logout"
-msgstr "Déconnexion"
-
 msgid "Clear log"
 msgstr "Effacer le journal"
 
@@ -29416,9 +29917,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29612,22 +30110,9 @@ msgstr "Images importées"
 msgid "Import vector graphics"
 msgstr "Importer des images vectorielles"
 
-msgid "Scale:"
-msgstr "Échelle :"
-
-msgid "unit(s) = "
-msgstr "unité(s) = "
-
-msgid "Importing..."
-msgstr "Importation…"
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "Fichiers SVG [greffon ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-"Veuillez ouvrir ou créer un calque de données avant de faire l’importation."
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29843,6 +30328,61 @@ msgstr "Nombre de jonctions à {0} chemins trouvées : {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "générer toutes les combinaisons de candidats entrée/sortie"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Remplacer la géométrie"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Index de direction ''{0}'' non trouvé"
 
@@ -30101,406 +30641,6 @@ msgstr "Activation du greffon Rapport d’erreur MapDust"
 msgid "Missing input data"
 msgstr "Données manquantes"
 
-msgid "Mapillary Images"
-msgstr "Images Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Calque Mapillary"
-
-msgid "Total images:"
-msgstr "Images totales :"
-
-msgid "images"
-msgstr "images"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Créer un calque Mapillary"
-
-msgid "Start Mapillary layer"
-msgstr "Commencer un calque 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 "Select pictures"
-msgstr "Sélectionner des photos"
-
-msgid "Import pictures into sequence"
-msgstr "Importer une séquence de photos"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importer une séquence de photos dans un calque Mapillary"
-
-msgid "Join mode"
-msgstr "Mode assemblage"
-
-msgid "Join/unjoin pictures"
-msgstr "(Dés)assembler les images"
-
-msgid "Join Mapillary pictures"
-msgstr "Assembler les images Mapillary"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr "Envoi de photographies"
-
-msgid "Upload Mapillary pictures"
-msgstr "Envoi de photographies Mapillary"
-
-msgid "Upload pictures."
-msgstr "Envoi de photographies."
-
-msgid "Walk mode"
-msgstr "Mode piéton"
-
-msgid "Start walk mode"
-msgstr "Commencer le 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 "Uploaded {0} images"
-msgstr "A envoyé {0} images"
-
-msgid "Approve upload on the website"
-msgstr "Approuver l’envoi sur ce site web"
-
-msgid "View in website"
-msgstr "Voir sur le site"
-
-msgid "Copy key"
-msgstr "Copier la clé"
-
-msgid "Copy key tag"
-msgstr "Copier l’attribut de la clé"
-
-msgid "Edit on website"
-msgstr "Éditer sur le site web"
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-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 folder"
-msgstr "Sélectionner un dossier"
-
-msgid "Explore"
-msgstr "Explorer"
-
-msgid "Select a directory"
-msgstr "Sélectionner un répertoire"
-
-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 "Mapillary picture"
-msgstr "Image Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Ouvrir la fenêtre Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Fenêtre Mapillary"
-
-msgid "Open Mapillary main dialog"
-msgstr "Ouvrir la fenêtre Mapillary principale"
-
-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 ""
-
-msgid "Download mode"
-msgstr "Mode téléchargement"
-
-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 "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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"La zone OSM téléchargée est trop vaste. Le téléchargement restera semi-"
-"automatique jusqu''au redémarrage du calque."
-
-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 ""
-
-msgid "No images found"
-msgstr "Aucune image trouvée"
-
-msgid "Finished upload"
-msgstr "Envoi terminé"
-
-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 "Envoi en cours : {0}"
-
-msgid "The image key ''{0}'' is invalid!"
-msgstr "La clé de l''image ''{0}'' n''est pas valide!"
-
-msgid "The image key must not be null here!"
-msgstr "La clé de l''image ne doit pas être nulle!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "La séquence de clé de l''image ''{0}'' n''est pas valide!"
-
-msgid "The sequence key must not be null here!"
-msgstr "La séquence de clé de l''image ne doit pas être nulle!"
-
 msgid "Measured values"
 msgstr "Valeurs mesurées"
 
@@ -32059,6 +32199,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "déplacé"
+
 msgid "rail"
 msgstr "par rail"
 
@@ -32156,9 +32299,6 @@ msgstr "Récupérer"
 msgid "Join"
 msgstr "Joindre"
 
-msgid "moved"
-msgstr "déplacé"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Transport public : joindre des arrêts GTFS"
 
@@ -33233,6 +33373,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Bâtiments mitoyens"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr "À réparer"
 
@@ -33713,6 +33913,84 @@ msgstr "Choisissez une date d’expiration pour la clé :"
 msgid "Create a new signing key"
 msgstr "Créer une nouvelle clé de signature"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Avancer"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Retour arrière"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Voie de circulation inexistante."
 
@@ -34726,9 +35004,6 @@ msgstr "Trouvez les objets avec cet attribut"
 msgid "Multitag Background: highlight"
 msgstr "Mettre en avant l''arrière-plan doté de plusieurs étiquettes"
 
-msgid "Replace Geometry"
-msgstr "Remplacer la géométrie"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Remplacer la géométrie de l’objet sélectionné par une nouvelle"
 
@@ -34947,15 +35222,9 @@ msgstr "démarre/met en pause une reproduction vidéo"
 msgid "Video: {0}"
 msgstr "Vidéo: {0}"
 
-msgid "Backward"
-msgstr "Retour arrière"
-
 msgid "jumps n sec back"
 msgstr "recule de n secondes"
 
-msgid "Forward"
-msgstr "Avancer"
-
 msgid "jumps n sec forward"
 msgstr "avance de n secondes"
 
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index e917b76..01ef2d3 100644
--- a/i18n/po/ga.po
+++ b/i18n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:55+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:45+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -203,28 +203,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Earráid"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Earráid"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3277,9 +3277,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3681,10 +3678,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3721,6 +3718,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3730,6 +3730,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3766,6 +3769,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3984,6 +3993,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4194,30 +4209,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4461,9 +4476,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4984,9 +4996,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6406,6 +6415,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6645,6 +6657,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7917,9 +7937,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8483,6 +8500,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8534,6 +8554,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8546,6 +8572,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10599,6 +10631,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12680,6 +12715,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13042,6 +13080,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14685,6 +14726,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14796,7 +14840,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14975,6 +15022,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15269,18 +15319,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15290,6 +15328,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15422,6 +15463,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15789,6 +15833,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15903,6 +15950,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16100,6 +16150,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16122,6 +16177,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16278,6 +16336,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17598,6 +17660,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19217,6 +19282,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19887,10 +19955,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19905,6 +19973,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20774,6 +20848,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20858,6 +20936,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23063,7 +23145,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23730,16 +23818,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23748,18 +23830,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23772,18 +23842,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23976,9 +24034,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23988,6 +24057,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24003,39 +24078,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24054,9 +24114,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24111,10 +24180,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24130,7 +24205,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24175,7 +24250,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24209,6 +24284,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24227,6 +24305,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24317,10 +24398,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24566,6 +24650,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24904,3267 +25009,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29626,6 +29768,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29721,9 +29866,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30735,6 +30877,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31182,6 +31384,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32008,9 +32288,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32204,15 +32481,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 04af47e..0f551dd 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2016-01-01 15:11+0000\n"
 "Last-Translator: Marcos Lans <Unknown>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:56+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:46+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: gl\n"
 "X-Poedit-Language: Galician\n"
 
@@ -213,18 +213,6 @@ msgstr "Escoller no mapa os elementos escollidoss na lista superior."
 msgid "Add imagery layer {0}"
 msgstr "Engadir capa de imaxes {0}"
 
-msgid "Error"
-msgstr "Erro"
-
-msgid "Select image format for WMS layer"
-msgstr "Seleccionar un formato de imaxe para a capa WMS"
-
-msgid "Select WMS layers"
-msgstr "Seleccionar capas WMS"
-
-msgid "Add layers"
-msgstr "Engadir capas"
-
 msgid "Invalid service URL."
 msgstr "O enderezo web de servizo non é válido."
 
@@ -237,6 +225,18 @@ msgstr "Non se puido recuperar a listaxe de capas WMS."
 msgid "Could not parse WMS layer list."
 msgstr "Non se puido analizar a listaxe de capas WMS."
 
+msgid "Error"
+msgstr "Erro"
+
+msgid "Select image format for WMS layer"
+msgstr "Seleccionar un formato de imaxe para a capa WMS"
+
+msgid "Select WMS layers"
+msgstr "Seleccionar capas WMS"
+
+msgid "Add layers"
+msgstr "Engadir capas"
+
 msgid "Add Node..."
 msgstr "Engadir un nodo…"
 
@@ -3465,9 +3465,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3887,10 +3884,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3927,6 +3924,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr "Esta proba comproba que as liñas de costa sexan correctas."
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr "Liña de costa desconectada"
 
@@ -3936,6 +3936,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr "Liña de costa revertida"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3972,6 +3975,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4192,6 +4201,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4404,30 +4419,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4671,9 +4686,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5205,9 +5217,6 @@ msgstr "A lonxitude xeográfica na posición do punteiro do rato."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "a capa non está na lista."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6692,6 +6701,9 @@ msgstr ""
 msgid "Sort"
 msgstr "Ordenar"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tipo de obxecto:"
 
@@ -6937,6 +6949,14 @@ msgstr "Descarga o contido das modificacións"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Descarga o contido das modificacións escollidas desde o servidor"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Os meus conxuntos de cambios."
 
@@ -8257,9 +8277,6 @@ msgstr "Introduza un nome de lugar para procurar"
 msgid "Areas around places"
 msgstr "Área arredor dos lugares"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Excepción de punteiro nulo, posiblemente faltan algunhas etiquetas."
-
 msgid "Search ..."
 msgstr "Procurar …"
 
@@ -8847,6 +8864,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8898,6 +8918,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8910,6 +8936,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -11015,6 +11047,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr "Debuxar os números de orde dos segmentos"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Debuxar os límites dos datos descargados"
 
@@ -13146,6 +13181,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "Fallo de importación NMEA!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Excepción de punteiro nulo, posiblemente faltan algunhas etiquetas."
+
 msgid "Note Files"
 msgstr ""
 
@@ -13524,6 +13562,9 @@ msgstr "Subindo datos…"
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Atopouse un ID 0 inesperado para primitivas de osm"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -15210,6 +15251,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15321,7 +15365,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15500,6 +15547,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15794,18 +15844,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15815,6 +15853,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15947,6 +15988,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -16314,6 +16358,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Descargar datos OSM ao longo de unha vía"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16431,6 +16478,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Axuda a vectorizar imaxes WMS."
 
@@ -16648,6 +16698,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificion entre medianeras a partires de bloques únicos"
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16672,6 +16727,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Engadido para asinar dixitalmente Datos de OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16835,6 +16893,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -18155,6 +18217,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Vado"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Vías"
 
@@ -19775,6 +19840,9 @@ msgstr "Pista"
 msgid "Taxiway"
 msgstr "Pista de rodaxe"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Heliporto"
 
@@ -20445,11 +20513,11 @@ msgstr "Número do punto"
 msgid "Point Name"
 msgstr "Nome do Punto"
 
-msgid "Phone Number"
-msgstr "Número de teléfono"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Utilizar código internacional, como +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -20463,6 +20531,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -21332,6 +21406,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -21416,6 +21494,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23621,7 +23703,13 @@ msgstr "Reserva Natural"
 msgid "Scree"
 msgstr "Cantos"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -24288,16 +24376,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -24306,18 +24388,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24330,18 +24400,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24534,9 +24592,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24546,6 +24615,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24561,39 +24636,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24612,9 +24672,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24669,10 +24738,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24688,7 +24763,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24733,7 +24808,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24767,6 +24842,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24785,6 +24863,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24875,10 +24956,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -25124,6 +25208,27 @@ msgstr "Enviando camiño(s) GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr "Importando…"
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Escala:"
+
+msgid "unit(s) = "
+msgstr "unidade(s)= "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25462,6 +25567,403 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
+msgid "Mapillary Images"
+msgstr ""
+
+msgid "Mapillary layer"
+msgstr ""
+
+msgid "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr ""
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr ""
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr ""
 
@@ -27129,9 +27631,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Login"
-msgstr ""
-
 msgid "Enable autologin"
 msgstr ""
 
@@ -27164,9 +27663,6 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Logout"
-msgstr ""
-
 msgid "Clear log"
 msgstr ""
 
@@ -27716,9 +28212,6 @@ msgstr ""
 msgid "cm"
 msgstr ""
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr ""
 
@@ -27888,21 +28381,9 @@ msgstr "Imaxes Importadas"
 msgid "Import vector graphics"
 msgstr "Importar gráficos vectoriais"
 
-msgid "Scale:"
-msgstr "Escala:"
-
-msgid "unit(s) = "
-msgstr "unidade(s)= "
-
-msgid "Importing..."
-msgstr "Importando…"
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -28107,6 +28588,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr ""
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -28352,400 +28888,6 @@ msgstr ""
 msgid "Missing input data"
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Valores medidos"
 
@@ -30211,6 +30353,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "ferrocarril"
 
@@ -30306,9 +30451,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -31322,6 +31464,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31772,6 +31974,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Avance"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Atrás"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32609,9 +32889,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32805,15 +33082,9 @@ msgstr "comeza/para a reprodución de vídeo"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "Atrás"
-
 msgid "jumps n sec back"
 msgstr "salta n seg atrás"
 
-msgid "Forward"
-msgstr "Avance"
-
 msgid "jumps n sec forward"
 msgstr "salta n seg adiante"
 
diff --git a/i18n/po/he.po b/i18n/po/he.po
index 1d56b01..fe18b17 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2013-03-30 13:38+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Hebrew <he at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:59+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:48+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: he\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr "הגדר את הפריטים הנבחרים שעל המפה לפריטי
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "שגיאה"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "שגיאה"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3291,9 +3291,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3697,10 +3694,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3737,6 +3734,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr "מבחן זה בודק שקווי חוף נכונים."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "קו חוף הפוך: האדמה לא בצד שמאל"
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3746,6 +3746,9 @@ msgstr "קו חוף"
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3782,6 +3785,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4000,6 +4009,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4212,30 +4227,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4479,9 +4494,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "מבחן זה בודק את הכיוון של דרכי מים, אדמה וקווי חוף."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "קו חוף הפוך: האדמה לא בצד שמאל"
-
 msgid "Reversed land: land not on left side"
 msgstr "אדמה הפוכה: האדמה לא בצד שמאל"
 
@@ -5002,9 +5014,6 @@ msgstr "קו האורך הגיאוגרפי בסמן העכבר."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "השכבה אינה ברשימה."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6432,6 +6441,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "סוג עצם:"
 
@@ -6672,6 +6684,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7945,9 +7965,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8511,6 +8528,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8562,6 +8582,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8574,6 +8600,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10637,6 +10669,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr "צייר מספרים סידוריים של קטע"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "צייר גבולות של נתונים שהורדו"
 
@@ -12720,6 +12755,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "יבוא NMEA נכשל!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13082,6 +13120,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14727,6 +14768,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14838,7 +14882,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15017,6 +15064,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15311,18 +15361,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15332,6 +15370,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15464,6 +15505,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15831,6 +15875,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15945,6 +15992,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16142,6 +16192,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16164,6 +16219,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16320,6 +16378,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17640,6 +17702,9 @@ msgstr ""
 msgid "Ford"
 msgstr "אזור צליחה"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "דרכים"
 
@@ -19259,6 +19324,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19929,11 +19997,11 @@ msgstr "מספר נקודה"
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
-msgstr "מספר טלפון"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -19947,6 +20015,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "מספר טלפון"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20816,6 +20890,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20900,6 +20978,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23105,7 +23187,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23772,16 +23860,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
+msgid "national"
 msgstr ""
 
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23790,18 +23872,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23814,18 +23884,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24018,9 +24076,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24030,6 +24099,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24045,39 +24120,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24096,9 +24156,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24153,10 +24222,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24172,7 +24247,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24217,7 +24292,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24251,6 +24326,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24269,6 +24347,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24359,10 +24440,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24608,6 +24692,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24946,3270 +25051,3307 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Align Ways"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Choose from..."
-msgstr "בחר מ..."
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
 
-msgid "Select commune"
+msgid "Length preserved"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Angle preserved"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Set background transparent."
-msgstr "קבע רקע שקוף."
-
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
-msgstr "כתובת"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "show address dialog"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Debug"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Create boundary"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Alert Message"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Street Name:"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Create building"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Length step:"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "{0} not allowed with the current projection"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Set width of the building"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Merge address points"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "(optional)"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Change location"
-msgstr "שנה מיקום"
-
-msgid "Set a new location for the next request"
-msgstr "קבע מיקום חדש לבקשה הבאה"
-
-msgid "Add a new municipality layer"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "Commune"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+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] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid "Departement"
+msgid "on polygon"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Add address"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Next no"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Reset cookie"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid "Select Feuille"
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Image cropping"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
 msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
 msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Choose from..."
+msgstr "בחר מ..."
+
+msgid "Select commune"
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Auto sourcing"
 msgstr ""
 
-msgid "East"
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "I use the mouse"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Change the current projection"
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid "Adjust WMS"
-msgstr "התאם WMS"
+msgid "Reverse grey colors (for black backgrounds)."
+msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "Set background transparent."
+msgstr "קבע רקע שקוף."
+
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "Reset offset"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Blank Layer"
-msgstr "שכבה ריקה"
+msgid "Select first WMS layer in list."
+msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "off"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "25 m"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "50 m"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "100 m"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "high"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "medium"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "low"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "symbol"
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "parcel"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "parcel number"
 msgstr ""
 
-msgid "Use"
-msgstr "שימוש"
+msgid "address"
+msgstr "כתובת"
 
-msgid "Please select a scheme to use."
+msgid "locality"
 msgstr ""
 
-msgid "Color Scheme"
-msgstr "סכמת צבעים"
-
-msgid "Please select the scheme to delete."
-msgstr "בחר סכמה למחיקה."
-
-msgid "Use the selected scheme from the list."
-msgstr "השתמש בסכמה הנבחרת מהרשימה."
-
-msgid "Use the current colors as a new color scheme."
-msgstr "השתמש בצבעים הנוכחיים כסכמת הצבעים החדשה"
+msgid "section"
+msgstr ""
 
-msgid "Delete the selected scheme from the list."
-msgstr "מחק את הסכמה הנבחרת מהרשימה"
+msgid "commune"
+msgstr ""
 
-msgid "Color Schemes"
-msgstr "סכמות צבעים"
+msgid "Enable automatic caching."
+msgstr ""
 
-msgid "Conflate object pair"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "French cadastre WMS"
+msgstr ""
 
-msgid "Conflation"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Matches"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Reference only"
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Subject only"
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Configure"
-msgstr "קבע תצורה"
+msgid "High resolution (1000x800)"
+msgstr ""
 
-msgid "Configure conflation options"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Conflate"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Layers:"
 msgstr ""
 
-msgid "Match finder method"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Parcels."
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Layer:"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Subject"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Empty selection"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Create buildings"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Image already loaded"
 msgstr ""
 
 msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "Requires restart"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Max threads"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Extra download area"
+msgid "Georeference an image"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid "Max download area"
+msgid "Georeferencing interrupted"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Split area"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
 msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "(optional)"
 msgstr ""
 
-msgid "Format errors: "
-msgstr ""
+msgid "Change location"
+msgstr "שנה מיקום"
 
-msgid "TangoGPS import success"
+msgid "Set a new location for the next request"
+msgstr "קבע מיקום חדש לבקשה הבאה"
+
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Commune"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Download along..."
+msgid "Departement"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid "Download Along"
+msgid "Add new layer"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "EditGpx"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
-msgstr ""
-
-msgid "Convert to GPX layer with anonymised time"
-msgstr ""
-
-msgid "edit gpx tracks"
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Import path from GPX layer"
-msgstr "ייבא נתיב משכבת GPX"
-
-msgid "Drop existing path"
-msgstr "זנח נתיב קיים"
-
-msgid "No GPX data layer found."
-msgstr "לא נמצאה שכבת נתוני GPX"
-
-msgid "External tool error"
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Export image (only raster images)"
 msgstr ""
 
 msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
-msgstr ""
-
-msgid "exttool:{0}"
-msgstr ""
-
-msgid "External Tool: {0}"
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Image cropping"
 msgstr ""
 
-msgid "CmdLine:"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "External tools"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "Are you sure?"
-msgstr "האם אתה בטוח?"
-
-msgid "New tool..."
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Install"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Public"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid "East"
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "GeoChat"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Open GeoChat panel"
-msgstr ""
+msgid "Adjust WMS"
+msgstr "התאם WMS"
 
-msgid "Zoom in to see messages"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "Login"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Reset offset"
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
-msgstr ""
+msgid "Blank Layer"
+msgstr "שכבה ריקה"
 
-msgid "Failed to send message:"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "Users mapping nearby:"
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Private chat"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Close tab"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Logout"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Clear log"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
-msgstr ""
+msgid "Use"
+msgstr "שימוש"
 
-msgid "Error loading geojson file {0}"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Position only"
-msgstr "מיקום בלבד"
-
-msgid "Position, Time, Date, Speed"
-msgstr "מיקום, שעה, תאריך, מהירות"
+msgid "Color Scheme"
+msgstr "סכמת צבעים"
 
-msgid "Position, Time, Date, Speed, Altitude"
-msgstr "יקום, שעה, תאריך, מהירות, רום"
+msgid "Please select the scheme to delete."
+msgstr "בחר סכמה למחיקה."
 
-msgid "A By Time"
-msgstr "A ע\"י זמן"
+msgid "Use the selected scheme from the list."
+msgstr "השתמש בסכמה הנבחרת מהרשימה."
 
-msgid "A By Distance"
-msgstr "A ע\"י מרחק"
+msgid "Use the current colors as a new color scheme."
+msgstr "השתמש בצבעים הנוכחיים כסכמת הצבעים החדשה"
 
-msgid "B By Time"
-msgstr "B ע\"י זמן"
+msgid "Delete the selected scheme from the list."
+msgstr "מחק את הסכמה הנבחרת מהרשימה"
 
-msgid "B By Distance"
-msgstr "B ע\"י מרחק"
+msgid "Color Schemes"
+msgstr "סכמות צבעים"
 
-msgid "C By Time"
-msgstr "C ע\"י זמן"
+msgid "Conflate object pair"
+msgstr ""
 
-msgid "C By Distance"
-msgstr "C ע\"י מרחק"
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Data Logging Format"
+msgid "Conflation"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Matches"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Reference only"
 msgstr ""
 
-msgid "Port:"
-msgstr "פורט:"
-
-msgid "refresh the port list"
-msgstr "רענן את רשימת הפורטים"
-
-msgid "Configure Device"
-msgstr "קבע תצורת מכשיר"
-
-msgid "Connection Error."
-msgstr "שגיאת התחברות."
-
-msgid "configure the connected DG100"
-msgstr "מגדיר את ה-DG100 המחובר"
-
-msgid "delete data after import"
-msgstr "מחק נתונים לאחר ייבוא"
-
-msgid "Importing data from device."
-msgstr "מייבא נתונים ממכשיר."
-
-msgid "Importing data from DG100..."
-msgstr "מייבא נתונים מDG100..."
+msgid "Subject only"
+msgstr ""
 
-msgid "Error deleting data."
-msgstr "שגיאה במחירת נתונים."
+msgid "Matches ({0})"
+msgstr ""
 
-msgid "imported data from {0}"
-msgstr "נתונים ביובאים מ-{0}"
+msgid "Reference only ({0})"
+msgstr ""
 
-msgid "No data found on device."
-msgstr "לא נמצאו נתונים על מכשיר."
+msgid "Subject only ({0})"
+msgstr ""
 
-msgid "Connection failed."
-msgstr "ההתחברות נכשלה."
+msgid "Configure"
+msgstr "קבע תצורה"
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "Import"
-msgstr "ייבא"
-
-msgid "GPS Blams"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Conflate"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Class element without name"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Tag without key"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Layer:"
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Subject"
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Restore subject selection"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Empty selection"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download Settings"
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Settings for the continuous download."
 msgstr ""
 
 msgid ""
-"File not found:\n"
-"{0}"
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
 msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "Max threads"
 msgstr ""
 
-msgid "height (m)"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "width (m)"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "length (m)"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "weight (t)"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "axleload (t)"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Bookmark name"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Max download area"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Access class"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Access types"
+msgid "Split area"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "Road requirements"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Download along..."
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Download Along"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "default"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "end nodes"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "incline"
+msgid "EditGpx"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "Parameters:"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "Coloring:"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Create/update graph"
-msgstr ""
+msgid "Import path from GPX layer"
+msgstr "ייבא נתיב משכבת GPX"
 
-msgid "Graphview"
-msgstr ""
+msgid "Drop existing path"
+msgstr "זנח נתיב קיים"
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
-msgstr ""
+msgid "No GPX data layer found."
+msgstr "לא נמצאה שכבת נתוני GPX"
 
-msgid "Ruleset"
+msgid "External tool error"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Select directory"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Vehicle"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Visualization"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "External tools"
 msgstr ""
 
-msgid "Node color"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Arrow color"
-msgstr ""
+msgid "Are you sure?"
+msgstr "האם אתה בטוח?"
 
-msgid "Arrowhead fill color"
+msgid "New tool..."
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Install"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Public"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "Choose node color"
+msgid "GeoChat"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "graphview default node"
+msgid "not logged in"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "User {0} has left"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "Private chat"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Close tab"
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Clear log"
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Download imagery XML bounds"
-msgstr ""
+msgid "Position only"
+msgstr "מיקום בלבד"
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
-msgstr ""
+msgid "Position, Time, Date, Speed"
+msgstr "מיקום, שעה, תאריך, מהירות"
 
-msgid "Open Imagery XML file"
-msgstr ""
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr "יקום, שעה, תאריך, מהירות, רום"
 
-msgid "Calibration Layer"
-msgstr ""
+msgid "A By Time"
+msgstr "A ע\"י זמן"
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgid "A By Distance"
+msgstr "A ע\"י מרחק"
 
-msgid "A calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgid "B By Time"
+msgstr "B ע\"י זמן"
 
-msgid "Change Color"
+msgid "B By Distance"
+msgstr "B ע\"י מרחק"
+
+msgid "C By Time"
+msgstr "C ע\"י זמן"
+
+msgid "C By Distance"
+msgstr "C ע\"י מרחק"
+
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Port:"
+msgstr "פורט:"
+
+msgid "refresh the port list"
+msgstr "רענן את רשימת הפורטים"
+
+msgid "Configure Device"
+msgstr "קבע תצורת מכשיר"
+
+msgid "Connection Error."
+msgstr "שגיאת התחברות."
+
+msgid "configure the connected DG100"
+msgstr "מגדיר את ה-DG100 המחובר"
+
+msgid "delete data after import"
+msgstr "מחק נתונים לאחר ייבוא"
+
+msgid "Importing data from device."
+msgstr "מייבא נתונים ממכשיר."
+
+msgid "Importing data from DG100..."
+msgstr "מייבא נתונים מDG100..."
+
+msgid "Error deleting data."
+msgstr "שגיאה במחירת נתונים."
+
+msgid "imported data from {0}"
+msgstr "נתונים ביובאים מ-{0}"
+
+msgid "No data found on device."
+msgstr "לא נמצאו נתונים על מכשיר."
+
+msgid "Connection failed."
+msgstr "ההתחברות נכשלה."
+
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Import"
+msgstr "ייבא"
+
+msgid "GPS Blams"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "GPSBlam"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "GPX Data"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Offset"
+msgid "Class element without name"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid "mm"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid "cm"
+msgid "Tag without key"
 msgstr ""
 
-msgid "m"
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "km"
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "Offset Information"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid "Determined right here"
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Reason"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "No ruleset"
 msgstr ""
 
 msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
 msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+"File not found:\n"
+"{0}"
 msgstr ""
 
 msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "File not found:\n"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "height (m)"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "width (m)"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "length (m)"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "weight (t)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "axleload (t)"
 msgstr ""
 
-msgid "Normal"
-msgstr "רגיל"
-
-msgid "Rotate 90"
-msgstr "סובב 90"
-
-msgid "Rotate 180"
-msgstr "סובב 180"
-
-msgid "Rotate 270"
-msgstr "סובב 270"
-
-msgid "Previous image"
-msgstr "תמונה קודמת"
-
-msgid "Next image"
-msgstr "תמונה הבאה"
-
-msgid "Rotate left"
-msgstr "סובב שמאלה"
-
-msgid "Rotate image left"
-msgstr "סובב תמונה שמאלה"
-
-msgid "Rotate right"
-msgstr "סובב ימינה"
-
-msgid "Rotate image right"
-msgstr "סובב תמונה ימינה"
-
-msgid "WayPoint Image"
-msgstr "תמונת נקודת דרך"
-
-msgid "Display non-geotagged photos"
-msgstr "הצג תמונות ללא תיוג גיאוגרפי"
-
-msgid "Imported Images"
-msgstr "תמונות מיובאות"
-
-msgid "Import vector graphics"
+msgid "Bookmark name"
 msgstr ""
 
-msgid "Scale:"
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "Importing..."
+msgid "Access class"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Access types"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Road requirements"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "POWER"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Working Level"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Level Name"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "default"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "end nodes"
 msgstr ""
 
-msgid "Fitting"
+msgid "incline"
 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>"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Parameters:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Coloring:"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Graphview"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Ruleset"
 msgstr ""
 
-msgid "InfoMode"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "GPX info mode"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+msgid "Select directory"
 msgstr ""
 
-msgid "Delete this"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Delete this&older"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "km/h"
+msgid "Visualization"
 msgstr ""
 
-msgid "Track name: "
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Node color"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Arrow color"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "New bookmark"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "filtering ways"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "Choose node color"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "junctions"
+msgid "graphview default node"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "order of junction (n):"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgstr ""
+
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
 msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "Check "
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Search "
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "edit bounds for selected defaults"
+msgstr ""
+
+msgid "Download imagery XML bounds"
 msgstr ""
 
 msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid "Change Color"
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "The starting location was not within the bbox"
-msgstr "המיקום ההתחלתי נמצא מחוץ לתחום"
+msgid "Are you sure this imagery offset is wrong?"
+msgstr ""
 
-msgid "Looking for shoreline..."
-msgstr "מחפש קו חוף..."
+msgid "Are you sure this calibration geometry is aligned badly?"
+msgstr ""
 
-msgid "{0} nodes so far..."
-msgstr "{0} נקודות עד כה..."
+msgid "Warning: deprecation is basically irreversible!"
+msgstr ""
 
-msgid "Lake Walker."
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "Lake Walker"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
-msgstr "שגיאה ביצירת ספריית מטמון: {0}"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
+msgstr ""
 
-msgid "Tracing"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "checking cache..."
-msgstr "בודק מטמון..."
+msgid "Get Imagery Offset..."
+msgstr ""
 
-msgid "Running vertex reduction..."
-msgstr "מריץ הפחתת קודקודים..."
+msgid "Download offsets for current imagery from a server"
+msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
-msgstr "מריץ הערכת דאגלס-פאוקר..."
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
+msgstr ""
 
-msgid "Removing duplicate nodes..."
-msgstr "מוריד נקודות כפולות..."
+msgid "Loading imagery offsets..."
+msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "Offset"
 msgstr ""
 
-msgid "east"
-msgstr "מזרח"
+msgid "Imagery Offset Database"
+msgstr ""
 
-msgid "northeast"
-msgstr "צפון-מזרח"
+msgid "mm"
+msgstr ""
 
-msgid "north"
-msgstr "צפון"
+msgid "cm"
+msgstr ""
 
-msgid "northwest"
-msgstr "צפון-מערב"
+msgid "km"
+msgstr ""
 
-msgid "west"
-msgstr "מערב"
+msgid "Calibration geometries"
+msgstr ""
 
-msgid "southwest"
-msgstr "דרום-מערב"
+msgid "Deprecated offsets"
+msgstr ""
 
-msgid "south"
-msgstr "דרום"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgstr ""
 
-msgid "southeast"
-msgstr "דרום-מזרח"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
+msgstr ""
 
-msgid "coastline"
-msgstr "קו חוף"
+msgid "Deprecated by {0} on {1}"
+msgstr ""
 
-msgid "land"
-msgstr "אדמה"
+msgid "Created by {0} on {1}"
+msgstr ""
 
-msgid "Maximum number of segments per way"
-msgstr "מספר מירבי של קטעים בדרך"
+msgid "Offset Information"
+msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "Report this offset"
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
-msgstr "ערך אפור מירבי שנחשב כ\"מים\" (0-255)"
+msgid "You are to notify moderators of this offset. Why?"
+msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
-msgstr "דיוק הפשטת קו (מעלות)"
+msgid "Reporting the offset..."
+msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "Determined right here"
 msgstr ""
 
-msgid "Direction to search for land"
-msgstr "כיוון לחיפוש אדמה"
+msgid "Determined {0} away"
+msgstr ""
 
-msgid "Tag ways as"
-msgstr "תייג אדמה כ"
+msgid "Reason"
+msgstr ""
 
-msgid "WMS Layer"
-msgstr "שכבת WMS"
+msgid "This entry has been reported."
+msgstr ""
 
-msgid "Maximum cache size (MB)"
-msgstr "גודל מטמון מירבי (MB)"
+msgid "Server has rejected the request"
+msgstr ""
 
-msgid "Maximum cache age (days)"
-msgstr "גיל מטמון מירבי (ימים)"
+msgid "Unable to connect to the server"
+msgstr ""
 
-msgid "Source text"
-msgstr "טקסט מקור"
+msgid "Store Imagery Offset..."
+msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Store imagery offset"
 msgstr ""
 
 msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
-"מספר מירבי של נקודות לייצור לפני חילוץ (לפני פישוט קווים). ברירת מחדל 50000."
 
 msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
-"הדיוק של פישוט קו דאגלס-פאוקר, נמדד במעלות. <br>ערכים נמוכים נותנים יותר "
-"נקודות, וקווים מדוייקים יותר. ברירת מחדל 0.0003."
 
 msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
-msgstr "הסט כל הנקודות בכיוון מזרח (מעלות). ברירת מחדל 0."
-
-msgid "Offset all points in North direction (degrees). Default 0."
-msgstr "הסט כל הנקודות בכיוון צפון (מעלות). ברירת מחדל 0."
-
-msgid "Direction to search for land. Default east."
-msgstr "כיוון לחיפוש אדמה. ברירת המחדל היא מזרח."
+msgid "This string should be 3 to 200 letters long."
+msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr "תייג דרכים כמים, קו חוף, אדמה או כלום. ברירת המחדל היא מים."
+msgid "Adjust imagery"
+msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr "הגודל המירבי לכל ספריית מטמון בבייטים. ברירת המחדל היא 300MB"
+msgid "Please select the imagery layer to adjust."
+msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "הגיל המירבי לכל ספריית מטמון בימים. ברירת המחדל היא 100"
+msgid "Start adjusting"
+msgstr ""
 
-msgid "Data source text. Default is Landsat."
-msgstr "הגודל המירבי לכל ספריית מטמון בבייטים. ברירת המחדל היא 300MB"
+msgid "There are currently no imagery layer to adjust."
+msgstr ""
 
-msgid "Downloading image tile..."
-msgstr "מוריד משטח תמונה..."
+msgid "No layers to adjust"
+msgstr ""
 
-msgid "Could not acquire image"
-msgstr "לא יכול להשיג תמונה"
+msgid "Normal"
+msgstr "רגיל"
 
-msgid "Connection Failed"
-msgstr "ההתחברות נכשלה"
+msgid "Rotate 90"
+msgstr "סובב 90"
 
-msgid "Not connected"
-msgstr "לא מחובר"
+msgid "Rotate 180"
+msgstr "סובב 180"
 
-msgid "Connecting"
-msgstr "מתחבר"
+msgid "Rotate 270"
+msgstr "סובב 270"
 
-msgid "Connected"
-msgstr "מחובר"
+msgid "Previous image"
+msgstr "תמונה קודמת"
 
-msgid "no name"
-msgstr ""
+msgid "Next image"
+msgstr "תמונה הבאה"
 
-msgid "Live GPS"
-msgstr ""
+msgid "Rotate left"
+msgstr "סובב שמאלה"
 
-msgid "Show GPS data."
-msgstr "הצג נתוני GPS."
+msgid "Rotate image left"
+msgstr "סובב תמונה שמאלה"
 
-msgid "Status"
-msgstr "סטטוס"
+msgid "Rotate right"
+msgstr "סובב ימינה"
 
-msgid "Way Info"
-msgstr "מידע דרך"
+msgid "Rotate image right"
+msgstr "סובב תמונה ימינה"
 
-msgid "Speed"
-msgstr "מהירות"
+msgid "WayPoint Image"
+msgstr "תמונת נקודת דרך"
 
-msgid "Course"
-msgstr "כיוון"
+msgid "Display non-geotagged photos"
+msgstr "הצג תמונות ללא תיוג גיאוגרפי"
 
-msgid "LiveGPS layer"
-msgstr "שכבת LiveGPS"
+msgid "Imported Images"
+msgstr "תמונות מיובאות"
 
-msgid "Capture GPS Track"
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Center Once"
-msgstr "מרכז פעם אחת"
-
-msgid "Center the LiveGPS layer to current position."
-msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי"
-
-msgid "Auto-Center"
-msgstr "מירכוז אוטומטי"
-
-msgid "Continuously center the LiveGPS layer to current position."
-msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי באופן רצוף"
-
-msgid "Open MapDust"
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Structure type:"
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Total images:"
+msgid "POWER"
 msgstr ""
 
-msgid "images"
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Working Level"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Mapillary"
+msgid "Level Name"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Export pictures"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Export images"
+msgid "Fitting"
 msgstr ""
 
-msgid "Import pictures"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Import local pictures"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "Select pictures"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Join mode"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "InfoMode"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Submit changeset"
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Delete this"
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "km/h"
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "Track name: "
 msgstr ""
 
-msgid "Upload pictures."
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Walk mode"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Start walk mode"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "View in website"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Copy key"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Edit on website"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Submit"
+msgid "junctions"
 msgstr ""
 
-msgid "Export all images"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Export selected images"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Select a folder"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Explore"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Select a directory"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Speed limit"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Give way"
+msgid "Check "
 msgstr ""
 
-msgid "No entry"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Search "
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Uneven road"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "No parking"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "No overtaking"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "No turn"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Years"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Months"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Days"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Imported images"
+msgid "Correct"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "Wrong"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Not older than: "
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Downloaded images"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Choose signs"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "Replace way"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Previous picture"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "The starting location was not within the bbox"
+msgstr "המיקום ההתחלתי נמצא מחוץ לתחום"
+
+msgid "Looking for shoreline..."
+msgstr "מחפש קו חוף..."
+
+msgid "{0} nodes so far..."
+msgstr "{0} נקודות עד כה..."
+
+msgid "Lake Walker."
 msgstr ""
 
-msgid "Jump to red"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Error creating cache directory: {0}"
+msgstr "שגיאה ביצירת ספריית מטמון: {0}"
+
+msgid "Tracing"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "checking cache..."
+msgstr "בודק מטמון..."
+
+msgid "Running vertex reduction..."
+msgstr "מריץ הפחתת קודקודים..."
+
+msgid "Running Douglas-Peucker approximation..."
+msgstr "מריץ הערכת דאגלס-פאוקר..."
+
+msgid "Removing duplicate nodes..."
+msgstr "מוריד נקודות כפולות..."
+
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "east"
+msgstr "מזרח"
+
+msgid "northeast"
+msgstr "צפון-מזרח"
+
+msgid "north"
+msgstr "צפון"
+
+msgid "northwest"
+msgstr "צפון-מערב"
+
+msgid "west"
+msgstr "מערב"
+
+msgid "southwest"
+msgstr "דרום-מערב"
+
+msgid "south"
+msgstr "דרום"
+
+msgid "southeast"
+msgstr "דרום-מזרח"
+
+msgid "coastline"
+msgstr "קו חוף"
+
+msgid "land"
+msgstr "אדמה"
+
+msgid "Maximum number of segments per way"
+msgstr "מספר מירבי של קטעים בדרך"
+
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Play"
+msgid "Maximum gray value to count as water (0-255)"
+msgstr "ערך אפור מירבי שנחשב כ\"מים\" (0-255)"
+
+msgid "Line simplification accuracy (degrees)"
+msgstr "דיוק הפשטת קו (מעלות)"
+
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Pause"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Direction to search for land"
+msgstr "כיוון לחיפוש אדמה"
+
+msgid "Tag ways as"
+msgstr "תייג אדמה כ"
+
+msgid "WMS Layer"
+msgstr "שכבת WMS"
+
+msgid "Maximum cache size (MB)"
+msgstr "גודל מטמון מירבי (MB)"
+
+msgid "Maximum cache age (days)"
+msgstr "גיל מטמון מירבי (ימים)"
+
+msgid "Source text"
+msgstr "טקסט מקור"
+
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
+"מספר מירבי של נקודות לייצור לפני חילוץ (לפני פישוט קווים). ברירת מחדל 50000."
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
+"הדיוק של פישוט קו דאגלס-פאוקר, נמדד במעלות. <br>ערכים נמוכים נותנים יותר "
+"נקודות, וקווים מדוייקים יותר. ברירת מחדל 0.0003."
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
-msgstr ""
+msgid "Offset all points in East direction (degrees). Default 0."
+msgstr "הסט כל הנקודות בכיוון מזרח (מעלות). ברירת מחדל 0."
 
-msgid "Delete after upload"
-msgstr ""
+msgid "Offset all points in North direction (degrees). Default 0."
+msgstr "הסט כל הנקודות בכיוון צפון (מעלות). ברירת מחדל 0."
 
-msgid "Wait for full quality pictures"
-msgstr ""
+msgid "Direction to search for land. Default east."
+msgstr "כיוון לחיפוש אדמה. ברירת המחדל היא מזרח."
 
-msgid "Follow selected image"
-msgstr ""
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgstr "תייג דרכים כמים, קו חוף, אדמה או כלום. ברירת המחדל היא מים."
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr "הגודל המירבי לכל ספריית מטמון בבייטים. ברירת המחדל היא 300MB"
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr "הגיל המירבי לכל ספריית מטמון בימים. ברירת המחדל היא 100"
 
-msgid "2 images joined"
-msgstr ""
+msgid "Data source text. Default is Landsat."
+msgstr "הגודל המירבי לכל ספריית מטמון בבייטים. ברירת המחדל היא 300MB"
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr "מוריד משטח תמונה..."
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr "לא יכול להשיג תמונה"
 
-msgid "2 images unjoined"
-msgstr ""
+msgid "Connection Failed"
+msgstr "ההתחברות נכשלה"
 
-msgid "everything in the visible area"
-msgstr ""
+msgid "Not connected"
+msgstr "לא מחובר"
 
-msgid "areas with downloaded OSM-data"
-msgstr ""
+msgid "Connecting"
+msgstr "מתחבר"
 
-msgid "only when manually requested"
-msgstr ""
+msgid "Connected"
+msgstr "מחובר"
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
-msgstr ""
+msgid "Show GPS data."
+msgstr "הצג נתוני GPS."
 
-msgid "Mapillary login"
-msgstr ""
+msgid "Status"
+msgstr "סטטוס"
 
-msgid "Login successful, return to JOSM."
-msgstr ""
+msgid "Way Info"
+msgstr "מידע דרך"
 
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
+msgid "Speed"
+msgstr "מהירות"
 
-msgid "Downloading Mapillary images"
-msgstr ""
+msgid "Course"
+msgstr "כיוון"
 
-msgid "Total Mapillary images: {0}"
-msgstr ""
+msgid "LiveGPS layer"
+msgstr "שכבת LiveGPS"
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
-msgstr ""
+msgid "Center Once"
+msgstr "מרכז פעם אחת"
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
+msgid "Center the LiveGPS layer to current position."
+msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי"
 
-msgid "Not Logged in to Mapillary"
-msgstr ""
+msgid "Auto-Center"
+msgstr "מירכוז אוטומטי"
 
-msgid "Uploading: {0}"
-msgstr ""
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי באופן רצוף"
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29672,6 +29814,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29767,9 +29912,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30781,6 +30923,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "מדרג"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31228,6 +31430,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "העבר"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32054,9 +32334,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32250,15 +32527,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "העבר"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index 766c701..b446a31 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:00+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:49+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: hi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "गलती"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "गलती"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 0081eb1..c4417ab 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:27+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:06+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: hr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -208,28 +208,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Dodaj slikovni sloj {0}"
 
-msgid "Error"
-msgstr "Greška"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Greška"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3383,9 +3383,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3790,10 +3787,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3830,6 +3827,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3839,6 +3839,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3875,6 +3878,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4093,6 +4102,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4303,30 +4318,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4570,9 +4585,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5094,9 +5106,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6525,6 +6534,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tip objekta:"
 
@@ -6765,6 +6777,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -8040,9 +8060,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr "Traži ..."
 
@@ -8623,6 +8640,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8675,6 +8695,12 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "Izađi iz JOSM-a bez spremanja. Nespremljene promijene biti će izgubljene."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Izbriši sada!"
 
@@ -8687,6 +8713,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10750,6 +10782,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12831,6 +12866,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13193,6 +13231,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14836,6 +14877,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14947,7 +14991,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15126,6 +15173,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15420,18 +15470,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15441,6 +15479,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15573,6 +15614,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15940,6 +15984,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16054,6 +16101,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16251,6 +16301,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16273,6 +16328,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16429,6 +16487,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17749,6 +17811,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Putevi"
 
@@ -19368,6 +19433,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -20038,10 +20106,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -20056,6 +20124,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20925,6 +20999,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -21009,6 +21087,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23214,7 +23296,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23881,16 +23969,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23899,18 +23981,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23923,18 +23993,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24127,9 +24185,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24139,6 +24208,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24154,39 +24229,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24205,9 +24265,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24262,10 +24331,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24281,7 +24356,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24326,7 +24401,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24360,6 +24435,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24378,6 +24456,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24468,10 +24549,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24717,6 +24801,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25055,3267 +25160,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
-msgstr "Nacrtaj zgrade"
-
-msgid "Point on the corner of the building to start drawing"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected valid number for increment"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Select commune"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Angle preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
-msgstr "Slojevi:"
+msgid "Something went wrong!"
+msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "show address dialog"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
 msgstr ""
 
 msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Alert Message"
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Street Name:"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Advanced settings"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Create building"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Length step:"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Grab non-georeferenced image"
-msgstr ""
+msgid "Draw buildings"
+msgstr "Nacrtaj zgrade"
 
-msgid "Georeferencing interrupted"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
+msgid "Merge address points"
 msgstr ""
 
-msgid "{0} not allowed with the current projection"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "(optional)"
+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] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid "Change location"
+msgid "on polygon"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Add address"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "Commune"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+msgid "Next no"
 msgstr ""
 
-msgid "Departement"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Add new layer"
-msgstr "Dodaj novi sloj"
+msgid "Select Feuille"
+msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid ""
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Save image as..."
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "Image cropping"
+msgid "Choose from..."
 msgstr ""
 
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
 msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Change the current projection"
 msgstr ""
 
-msgid "East"
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Reset offset"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "off"
 msgstr ""
 
-msgid "Blank Layer"
-msgstr "Prazan sloj"
+msgid "25 m"
+msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "50 m"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "100 m"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "high"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "medium"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "low"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "symbol"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "parcel"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "parcel number"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "address"
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "locality"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "section"
 msgstr ""
 
-msgid "Use"
+msgid "commune"
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Color Scheme"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Color Schemes"
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgstr ""
 
-msgid "Conflation"
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Matches"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Reference only"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Configure"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Conflate"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Layers:"
+msgstr "Slojevi:"
+
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Parcels."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Centroid distance"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Generate matches"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Layer:"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Subject"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Create buildings"
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Empty selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid "Create boundary"
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Cadastre grab"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Requires restart"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Max threads"
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Georeferencing interrupted"
 msgstr ""
 
-msgid "Max download boxes"
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
-msgid "Extra download area"
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
 msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid "Max download area"
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "(optional)"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Change location"
 msgstr ""
 
-msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "Split area"
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Departement"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid "Format errors: "
-msgstr ""
+msgid "Add new layer"
+msgstr "Dodaj novi sloj"
 
-msgid "TangoGPS import success"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "Download along..."
+msgid "Reset cookie"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid "Image cropping"
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "East"
 msgstr ""
 
-msgid "External tool error"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External tools"
-msgstr "Vanjski alati"
-
-msgid "Delete tool \"{0}\"?"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "New tool..."
-msgstr ""
+msgid "Blank Layer"
+msgstr "Prazan sloj"
 
-msgid "Install"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Public"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "GeoChat"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Login"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use"
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Users mapping nearby:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Private chat"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "Close tab"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "Logout"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Clear log"
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflation"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Position only"
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Configure"
 msgstr ""
 
-msgid "A By Time"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "B By Time"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "C By Time"
+msgid "Conflate"
 msgstr ""
 
-msgid "C By Distance"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Port:"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Configure Device"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Threshold distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "delete data after import"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Generate matches"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Layer:"
 msgstr ""
 
-msgid "No data found on device."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Subject"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid "Import"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "GPSBlam"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPX Data"
+msgid "Empty selection"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "Class element without name"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Max threads"
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Download strategy"
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "Split area"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "Format errors: "
 msgstr ""
 
-msgid "No ruleset"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Download along..."
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "Download Along"
 msgstr ""
 
-msgid "height (m)"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "width (m)"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "length (m)"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "weight (t)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Access class"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Access types"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "External tool error"
 msgstr ""
 
-msgid "Road requirements"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "CmdLine:"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "External tools"
+msgstr "Vanjski alati"
+
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Are you sure?"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "New tool..."
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Install"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Public"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "end nodes"
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "incline"
+msgid "GeoChat"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "Parameters:"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Coloring:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Create/update graph"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Graphview"
+msgid "not logged in"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Ruleset"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "User {0} has left"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Select directory"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Private chat"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Close tab"
 msgstr ""
 
-msgid "Visualization"
+msgid "Clear log"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Node color"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Arrow color"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position only"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "A By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "B By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "C By Distance"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Port:"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "Connection Error."
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "delete data after import"
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Importing data from device."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Connection failed."
 msgstr ""
 
 msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "Import"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "Change Color"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Class element without name"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Tag without key"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Offset"
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "mm"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "cm"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "m"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "km"
-msgstr "km"
+msgid "Closing tag element that was not open"
+msgstr ""
 
-msgid "Calibration geometries"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Offset Information"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Determined right here"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Reason"
+msgid "No ruleset"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "File not found:\n"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "height (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "width (m)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "length (m)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "axleload (t)"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access class"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Access types"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Road requirements"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 270"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Previous image"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Next image"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Rotate left"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Imported Images"
+msgid "default"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "end nodes"
 msgstr ""
 
-msgid "Scale:"
+msgid "incline"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Parameters:"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Coloring:"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Graphview"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Ruleset"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Select directory"
 msgstr ""
 
-msgid "POWER"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "Working Level"
+msgid "Visualization"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Level Name"
+msgid "Node color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark deletion"
 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>"
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose node color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview default node"
 msgstr ""
 
-msgid "GPX info mode"
+msgid "graphview default segment"
 msgstr ""
 
-msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "km/h"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
 msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Change Color"
 msgstr ""
 
-msgid "junctions"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "order of junction (n):"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "create the channel digraph"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid "Check "
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Search "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "Offset"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "mm"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "cm"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "km"
+msgstr "km"
+
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "Report this offset"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Tracing"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "checking cache..."
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "Reason"
 msgstr ""
 
-msgid "east"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "northeast"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "north"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "northwest"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "west"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "southwest"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "south"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
+msgstr ""
+
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29781,6 +29923,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "pomaknuto"
+
 msgid "rail"
 msgstr ""
 
@@ -29876,9 +30021,6 @@ msgstr "Uhvati"
 msgid "Join"
 msgstr "Spoji"
 
-msgid "moved"
-msgstr "pomaknuto"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30890,6 +31032,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terasa"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31337,6 +31539,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Naprijed"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32165,9 +32445,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32361,15 +32638,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "Naprijed"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index cb714cc..166cbc0 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:58+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:48+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index bddcbab..b37f5b5 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-27 19:58+0000\n"
-"Last-Translator: Zoltan Faludi <Unknown>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-10-07 10:56+0000\n"
+"Last-Translator: AndreasTUHU <poggyasz at gmail.com>\n"
 "Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:01+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:49+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: hu\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -214,18 +214,6 @@ msgstr "Kiválasztja a térképen a fenti listában kijelölt elemeket."
 msgid "Add imagery layer {0}"
 msgstr "Légifelvétel réteg hozzáadása: {0}"
 
-msgid "Error"
-msgstr "Hiba"
-
-msgid "Select image format for WMS layer"
-msgstr "Válassz képformátumot a WMS réteghez"
-
-msgid "Select WMS layers"
-msgstr "Válassz WMS réteget"
-
-msgid "Add layers"
-msgstr "Rétegek hozzáadása"
-
 msgid "Invalid service URL."
 msgstr "Érvénytelen szolgáltatáscím."
 
@@ -238,6 +226,18 @@ msgstr "WMS réteglista nem kinyerhető."
 msgid "Could not parse WMS layer list."
 msgstr "WMS réteglista nem értelmezhető."
 
+msgid "Error"
+msgstr "Hiba"
+
+msgid "Select image format for WMS layer"
+msgstr "Válassz képformátumot a WMS réteghez"
+
+msgid "Select WMS layers"
+msgstr "Válassz WMS réteget"
+
+msgid "Add layers"
+msgstr "Rétegek hozzáadása"
+
 msgid "Add Node..."
 msgstr "Pont hozzáadása..."
 
@@ -491,10 +491,10 @@ msgid "Download notes in current view"
 msgstr "Aktuális nézethez tartozó jegyzetek letöltése"
 
 msgid "Download in current view"
-msgstr ""
+msgstr "Aktuális nézet letöltése"
 
 msgid "Download map data from the OSM server in current view"
-msgstr ""
+msgstr "A jelenlegi nézet térképadatainak letöltése az OSM-szerverről"
 
 msgid "Download object..."
 msgstr "Objektumok letöltése…"
@@ -512,7 +512,7 @@ msgid "Duplicate"
 msgstr "Kettőzés"
 
 msgid "Duplicate selection."
-msgstr ""
+msgstr "Kijelölés duplikálása"
 
 msgid "Exit"
 msgstr "Kilépés"
@@ -1145,13 +1145,14 @@ msgid "Paste"
 msgstr "Beillesztés"
 
 msgid "Paste contents of clipboard."
-msgstr ""
+msgstr "Vágólap tartalmának beillesztése."
 
 msgid "Paste at source position"
-msgstr ""
+msgstr "Beillesztés eredeti pozícióba"
 
 msgid "Paste contents of clipboard at the position they were copied from."
 msgstr ""
+"Vágólap tartalmának beillesztése arra a helyre, ahonnan ki lett másolva."
 
 msgid "Paste Tags"
 msgstr "Címkék beillesztése"
@@ -1911,7 +1912,7 @@ msgid "Errors during download"
 msgstr "Hibák letöltés közben"
 
 msgid "Download Geo URL"
-msgstr ""
+msgstr "Geo URL letöltése"
 
 msgid "Download GPS"
 msgstr "GPS letöltése"
@@ -3026,7 +3027,7 @@ msgid "Change relation {0}"
 msgstr "{0} kapcsolat megváltoztatása"
 
 msgid "Change nodes of {0}"
-msgstr ""
+msgstr "{0} pontjainak módosítása"
 
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "''{0}'' eltávolítva ''{1}'' pontról"
@@ -3463,6 +3464,8 @@ msgid ""
 "Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
 "startup)."
 msgstr ""
+"IPv6 kapcsolat engedélyezésének megpróbálása, IPv6 preferálása IPv4-gyel "
+"szemben (csak az indítás korai fázisában működik)."
 
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "A {0} beállítás törölve, mivel már nincs használatban."
@@ -3559,9 +3562,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "A getCapabilities dokumentum nem definiált rétegeket: {0}"
 
-msgid "No layer selected"
-msgstr "Nincs réteg kiválasztva"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3571,6 +3571,8 @@ msgid ""
 "Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
 "identifier {2}"
 msgstr ""
+"Csak a négyzetes csempék támogatottak. A szerver visszatérési értéke {0}x{1} "
+"volt {2} TileMatrix azonosítónak"
 
 msgid "Note"
 msgstr "Megjegyzés"
@@ -3864,7 +3866,7 @@ msgstr ""
 "''{1}'' érték nem értelmezhető koordináta értékként ''{0}'' paraméternél."
 
 msgid "Custom Projection"
-msgstr "Egyéni Vetület"
+msgstr "egyéni vetület"
 
 msgid "GRS80"
 msgstr "GRS80"
@@ -3990,12 +3992,12 @@ msgstr "Többszörös associatedStreet kapcsolat"
 msgid "House number without street"
 msgstr "Házszám utca nélkül"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Duplikált ''{0}'' házszám"
-
 msgid "Duplicate house numbers"
 msgstr "Duplikált házszámok"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Duplikált ''{0}'' házszám"
+
 msgid "Multiple street names in relation"
 msgstr "Többszörös utcanév a kapcsolatban"
 
@@ -4032,6 +4034,9 @@ msgstr "Partvonalak"
 msgid "This test checks that coastlines are correct."
 msgstr "A teszt ellenőrzi, hogy rendben vannak-e a partonalak"
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Fordított partvonal: szárazföld nem a bal oldalon van"
+
 msgid "Unconnected coastline"
 msgstr "Nem összefüggő partvonal"
 
@@ -4041,6 +4046,9 @@ msgstr "Sorbarendezetlen partvonal"
 msgid "Reversed coastline"
 msgstr "Fordított partvonal"
 
+msgid "invalid coastline"
+msgstr "érvénytelen partvonal"
+
 msgid "Conditional Keys"
 msgstr "Feltételes Kulcsok"
 
@@ -4077,6 +4085,12 @@ msgstr "Keresztező határvonalak"
 msgid "Crossing barriers"
 msgstr "Keresztező akadályok"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4309,6 +4323,12 @@ msgstr "Nincs használható szerepe a multipoligon tagnak"
 msgid "Non-Way in multipolygon"
 msgstr "Nem-vonal a multipoligonban"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Hiányzó name:* fordítás"
 
@@ -4447,10 +4467,10 @@ msgid "<empty>"
 msgstr "<üres>"
 
 msgid "Role {0} unknown in templates {1}"
-msgstr ""
+msgstr "{0} szerep ismeretlen a(z) {1} sablonokban"
 
 msgid "Empty role type found when expecting one of {0}"
-msgstr ""
+msgstr "Üres szereptípus, pedig {0} közül kéne legyen valamelyik"
 
 msgid "Role {0} missing"
 msgstr "Hiányzó {0} szerep"
@@ -4533,30 +4553,30 @@ msgstr "A tulajdonságérték dupla szóközt tartalmaz"
 msgid "Property values contain HTML entity"
 msgstr "Tulajdonságérték HTML kódot tartalmaz"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "''{0}'' úgy néz ki mint ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Elírt tulajdonság kulcs"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "''{0}'' kulcs nincs az alapbeállításokban."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "''{0}'' úgy néz ki mint ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Az alapbeállítások nem tartalmazzák a tulajdonságkulcsot"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "''{1}'' kulcs értéke ''{0}'', ami erre hasonlít: ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "''{0}'' kulcs nincs az alapbeállításokban."
 
 msgid "Misspelled property value"
 msgstr "Elírt tulajdonság érték"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "''{0}'' érték ''{1}'' kulccsal nincs az alapbeállításokban."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "''{1}'' kulcs értéke ''{0}'', ami erre hasonlít: ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Az alapbeállítások nem tartalmazzák a tulajdonságértéket"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "''{0}'' érték ''{1}'' kulccsal nincs az alapbeállításokban."
+
 msgid "FIXMES"
 msgstr "FIXME-k"
 
@@ -4807,9 +4827,6 @@ msgstr "Hibásan rendezett vonalak"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Ez a teszt ellenőrzi a vizek, szárazföldek, partvonalak irányát."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Fordított partvonal: szárazföld nem a bal oldalon van"
-
 msgid "Reversed land: land not on left side"
 msgstr "Fordított szárzaföld: szárazföld nem a bal oldalon van"
 
@@ -5360,9 +5377,6 @@ msgstr "A fölrdajzi hosszúság az egérmutató alatt."
 msgid "System of measurement changed to {0}"
 msgstr "Mérési rendszer módosult erre: {0}"
 
-msgid "Layer not in list."
-msgstr "A réteg nincs a listában."
-
 msgid "Default (open, closed, new)"
 msgstr "Alapértelmezett (nyitás, bezárt, új)"
 
@@ -6898,6 +6912,9 @@ msgstr "Jegyzetek rendezése"
 msgid "Sort"
 msgstr "Rendezés"
 
+msgid "Open the note in an external browser"
+msgstr "Jegyzet megnyitása külső böngészőben"
+
 msgid "Object type:"
 msgstr "Objektum típus:"
 
@@ -7148,6 +7165,14 @@ msgstr "Módosításcsomag-tartalom letöltése"
 msgid "Download the content of the selected changesets from the server"
 msgstr "A kiválasztott módosításcsomagok adatainak letöltése a szerverről"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Saját módosításcsomagjaim"
 
@@ -8067,7 +8092,7 @@ msgid "Refers to"
 msgstr "Erre vonatkozik"
 
 msgid "Cannot add {0} since it is not part of dataset"
-msgstr ""
+msgstr "{0} nem adható hozzá, mert nem része az adathalmaznak"
 
 msgid "Download referring relations"
 msgstr "Kapcsolódó kapcsolatok letöltése"
@@ -8543,9 +8568,6 @@ msgstr "Adj meg egy keresendő helynevet"
 msgid "Areas around places"
 msgstr "Név szerinti keresés"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer kivétel, esetleg egy hiányzó címke miatt."
-
 msgid "Search ..."
 msgstr "Keresés ..."
 
@@ -9193,6 +9215,9 @@ msgstr "Elmentetlen változtatások - Mented/feltöltöd kilépés előtt?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Elmentetlen változtatások - Mented/feltöltöd törlés előtt?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Módosított rétegek feltöltés és mentése ..."
 
@@ -9260,6 +9285,12 @@ msgstr "Kilépés most!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Kilépés mentés nélkül. A mentetlen adatok levesznek."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Törlés most!"
 
@@ -9274,6 +9305,12 @@ msgstr ""
 "Kilépés mentés nélkül. A mentetlen változtatások fel lesznek töltve vagy el "
 "lesznek mentve."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Műveletek végrehajtása törlés előtt"
 
@@ -9771,6 +9808,8 @@ msgstr "több csempe megjelenítéséhez közelíts"
 
 msgid "increase tiles zoom level (change resolution) to see more detail"
 msgstr ""
+"csempe zoomszint növelése (felbontás módosítása) több részlet "
+"megjelenítéséhez"
 
 msgid "No tiles at this zoom level"
 msgstr "Nincs csempe ezen a nagyítási szinten"
@@ -9909,8 +9948,8 @@ msgstr "Réteg mentése"
 
 msgid "{0} note"
 msgid_plural "{0} notes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} jegyzet"
+msgstr[1] "{0} jegyzet"
 
 msgid "Notes layer"
 msgstr "Jegyzetek réteg"
@@ -11577,6 +11616,9 @@ msgstr "Egyirányú nyilak rajzolása."
 msgid "Draw segment order numbers"
 msgstr "Szakaszsorrend számok rajzolása"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "A letöltött adatok határvonalának kirajzolása"
 
@@ -12469,29 +12511,31 @@ msgid "Configure the list of sites where plugins are downloaded from"
 msgstr "A bővítmények letöltésére szolgáló tárhelyek listájának megadása"
 
 msgid "Load from list..."
-msgstr ""
+msgstr "Betöltés listából…"
 
 msgid "Load plugins from a list of plugins"
-msgstr ""
+msgstr "Bővítmények betöltése a bővítmények egy listájából"
 
 msgid "Disable all other plugins"
-msgstr ""
+msgstr "Minden más bővítmény letiltása"
 
 msgid "Enter a list of plugins you want to download."
-msgstr ""
+msgstr "Add meg a letölteni kívánt bővítmények listáját."
 
 msgid ""
 "You should add one plugin id per line, version information is ignored."
 msgstr ""
+"Soronként egy bővítmény azonosítót adhatsz meg, a verzióinformáció figyelmen "
+"kívül lesz hagyva."
 
 msgid "You can copy+paste the list of a status report here."
-msgstr ""
+msgstr "Akár egy állapotjelentés listát is bemásolhatsz."
 
 msgid "Load plugins from list"
-msgstr ""
+msgstr "Bővítmények betöltése listából"
 
 msgid "The following plugins were not found. Continue anyway?"
-msgstr ""
+msgstr "Az alábbi bővítmények nem találhatóak. Mindenképp folytatod?"
 
 msgid "Add JOSM Plugin description URL."
 msgstr "JOSM Bővítmény leíró URL hozzáadása."
@@ -13229,7 +13273,7 @@ msgid "Elements of type {0} are supported."
 msgstr "{0} típus elemei támogatottak."
 
 msgid "This preset also sets: {0}"
-msgstr ""
+msgstr "Ez a címkekészlet ezt is beállítja: {0}"
 
 msgid "Edit also …"
 msgstr "Szintén szerkesztendő..."
@@ -13479,6 +13523,8 @@ msgid ""
 "partial: different selected objects have different values for ''{0}'', do "
 "not change"
 msgstr ""
+"részleges: a különböző kiválasztott objektumok „{0}” értéke eltér, ne "
+"módosítsd"
 
 msgid "unset: do not set this property on the selected objects"
 msgstr ""
@@ -13577,7 +13623,7 @@ msgstr ""
 "''{0}'' zip fájlban. A kivétel: {1}"
 
 msgid "The requested URL {0} was not found"
-msgstr ""
+msgstr "A kért URL {0} nem található"
 
 msgid "Failed to rename file {0} to {1}."
 msgstr "A(z) {0} fájl átnevezése {1}-re meghiúsult."
@@ -13876,6 +13922,9 @@ msgstr "NMEA beolvasás sikeres:"
 msgid "NMEA import failure!"
 msgstr "NMEA beolvasás sikertelen!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Null pointer kivétel, esetleg egy hiányzó címke miatt."
+
 msgid "Note Files"
 msgstr "Jegyzet fájlok"
 
@@ -14271,6 +14320,9 @@ msgstr "Adatok feltöltése…"
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Nem várt (0) azonosító egy OSM elemhez"
 
+msgid "Failed to evaluate {0}"
+msgstr "Nem sikerült kiértékelni: {0}"
+
 msgid "Downloading data..."
 msgstr "Adatok letöltése..."
 
@@ -14362,10 +14414,10 @@ msgid "Cannot start IPv6 remotecontrol server on port {0}: {1}"
 msgstr "Nem sikerült IPv6 távirányító kiszolgálót indítani {0} porton: {1}"
 
 msgid "RemoteControl::Accepting remote connections on {0}:{1}"
-msgstr ""
+msgstr "Távirányító::Távoli kapcsolat fogadása: {0}:{1}"
 
 msgid "RemoteControl::Server {0}:{1} stopped."
-msgstr ""
+msgstr "Távirányító:: {0}:{1} kiszolgáló leállt."
 
 msgid "Cannot start IPv4 remotecontrol https server on port {0}: {1}"
 msgstr ""
@@ -14376,7 +14428,7 @@ msgstr ""
 "Nem sikerült IPv6 távirányító https kiszolgálót indítani {0} porton: {1}"
 
 msgid "RemoteControl::Accepting secure remote connections on {0}:{1}"
-msgstr ""
+msgstr "Távirányító::Távoli biztonságos kapcsolat fogadása: {0}:{1}"
 
 msgid "Remote Control has been asked to create a new node."
 msgstr "A Távirányítóhoz kérés érkezett, egy új pont létrehozására."
@@ -14455,7 +14507,7 @@ msgid "Confirm Remote Control action"
 msgstr "Távirányító aktivitás jóváhagyása"
 
 msgid "The following keys are mandatory, but have not been provided: {0}"
-msgstr ""
+msgstr "Az alábbi kulcsok kötelezőek, de nem lettek megadva: {0}"
 
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -14486,7 +14538,7 @@ msgid "Include OSM data in the .joz session file."
 msgstr "OSM adatok beágyazása a .joz munkamenet fájlba."
 
 msgid "Link to a GPX data file on your local disk."
-msgstr ""
+msgstr "Hivatkozás egy GPX fájlra a helyi lemezen."
 
 msgid "Include GPX data in the .joz session file."
 msgstr "GPX adatok beillesztése a .joz munkafolyam fájlba."
@@ -14783,7 +14835,7 @@ msgstr[0] "A bővítmény nem lesz betöltve."
 msgstr[1] "A bővítmények nem lesznek betöltve."
 
 msgid "Determining plugins to load..."
-msgstr ""
+msgstr "Betöltendő bővítmények meghatározása…"
 
 msgid "Removing deprecated plugins..."
 msgstr "Elavult bővítmények eltávolítása…"
@@ -15612,18 +15664,21 @@ msgid ""
 "This is always a coding error. If you are running the latest version of "
 "JOSM, please consider being kind and file a bug report."
 msgstr ""
+"Váratlan hiba történt.\n"
+"Ez mindig kódolási hiba. Ha a JOSM legújabb verzióját használod, arra "
+"kérünk, fontold meg a hiba bejelentését."
 
 msgid "Debug information"
-msgstr ""
+msgstr "Hibakeresési információk"
 
 msgid "Manually report at:"
-msgstr ""
+msgstr "Jelentés kézzel itt:"
 
 msgid "Is JOSM up to date?"
-msgstr ""
+msgstr "A JOSM naprakész?"
 
 msgid "Send bug report"
-msgstr ""
+msgstr "Hibajelentés küldése"
 
 msgid ""
 "If you are running the latest version of JOSM and the plugins, please file a "
@@ -15632,18 +15687,22 @@ msgid ""
 "include information on how to reproduce the error and try to supply as much "
 "detail as possible."
 msgstr ""
+"Ha a JOSM és bővítményei legfrissebb verzióját használod, kérlek küldj egy "
+"hibajelentést a hibajegy kezelőnkbe.\n"
+"A főbb adatok a hibáról itt már ki lesznek töltve neked. Kérlek, írd le a "
+"hiba reprodukálásának menetét és adj meg minél több részletet."
 
 msgid "Report Bug"
 msgstr "Hiba jelentése"
 
 msgid "Suppress this error for this session."
-msgstr ""
+msgstr "Ezen hiba elrejtése a munkamenet alatt."
 
 msgid "Suppress further error dialogs for this session."
 msgstr "További párbeszédablakok elhagyása ebben a munkamenetben."
 
 msgid "Ignore this error."
-msgstr ""
+msgstr "Hiba mellőzése."
 
 msgid ""
 "Opening the bug report failed. Please report manually using this website:"
@@ -15652,33 +15711,36 @@ msgstr ""
 "alábbi weboldalon:"
 
 msgid "Include the system status report."
-msgstr ""
+msgstr "Rendszer állapotjelentés csatolása."
 
 msgid "Include information about the data you were working on."
-msgstr ""
+msgstr "Információk csatolása az adatokról, amin dolgozol."
 
 msgid "Include all stack traces."
-msgstr ""
+msgstr "Teljes stack trace csatolása."
 
 msgid "Your current version of JOSM is {0}"
-msgstr ""
+msgstr "A jelenlegi JOSM verziód: {0}"
 
 msgid "JOSM is searching for updates..."
-msgstr ""
+msgstr "A JOSM frissítéseket keres…"
 
 msgid "An error occured while checking if your JOSM instance is up to date."
-msgstr ""
+msgstr "Hiba történt a JOSM verziód frissességének ellenőrzése közben."
 
 msgid "JOSM is up to date."
-msgstr ""
+msgstr "A JOSM naprakész."
 
 msgid "JOSM is out of date. The current version is {0}. Try updating JOSM."
 msgstr ""
+"A JOSM elavult, a jelenlegi verzió a {0}. Javasoljuk a JOSM frissítését."
 
 msgid ""
 "Before you file a bug report make sure you have updated to the latest "
 "version of JOSM here:"
 msgstr ""
+"Mielőtt hibajelentést küldenél be, győződj meg arról, hogy a legfrissebb "
+"JOSM verziót használod:"
 
 msgid "Update JOSM"
 msgstr "JOSM frissítés"
@@ -16073,7 +16135,7 @@ msgid "Strava running heatmap"
 msgstr "Strava futó hőtérkép"
 
 msgid "Strava cycling and running heatmap"
-msgstr ""
+msgstr "Strava kerékpáros és futó hőtérkép"
 
 msgid "Locator Overlay"
 msgstr "Kereső rátét"
@@ -16124,10 +16186,10 @@ msgid "OSM Inspector: Boundaries (EU)"
 msgstr "OSM Inspector: közigazgatási határok (EU)"
 
 msgid "IGN Argentina (WMTS)"
-msgstr ""
+msgstr "IGN Argentína (WMTS)"
 
 msgid "IGN Argentina (WMS)"
-msgstr ""
+msgstr "IGN Argentína (WMS)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI fekete-fehér 2.5m"
@@ -16177,6 +16239,9 @@ msgstr "Tiris: DGM (Domborzati modell)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Felületi model)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (általános célú)"
 
@@ -16202,10 +16267,10 @@ msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: Höhen und Gelände"
 
 msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr ""
+msgstr "AGIV (Vlaanderen / Flanders) legfrissebb légifotó (téli)"
 
 msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr ""
+msgstr "AGIV légifotó 10cm 2013-15"
 
 msgid "URBISfr numerical imagery (2013)"
 msgstr "URBISfr numerical imagery (2013)"
@@ -16241,7 +16306,7 @@ msgid "TEC bus lines (2014)"
 msgstr "TEC busz útvonalak (2014)"
 
 msgid "Benin:cotonou_pleiade_2016"
-msgstr ""
+msgstr "Benin:cotonou_pleiade_2016"
 
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
@@ -16288,8 +16353,11 @@ msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr "SDFE Overflade Skyggekort (40 cm)"
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16322,7 +16390,7 @@ msgid "BD Carthage"
 msgstr "BD Carthage"
 
 msgid "BDOrtho IGN"
-msgstr ""
+msgstr "BDOrtho IGN"
 
 msgid "Bordeaux - 2012"
 msgstr "Bordeaux - 2012"
@@ -16422,19 +16490,19 @@ msgid "Berlin aerial photograph 2015"
 msgstr "Berlin légifotó 2015"
 
 msgid "Berlin aerial photograph 2016"
-msgstr ""
+msgstr "Berlin légifotó 2016"
 
 msgid "Stuttgart (aerial imagery)"
 msgstr "Stuttgart (légifelvétel)"
 
 msgid "Erlangen aerial imagery (2016 5.0 cm)"
-msgstr ""
+msgstr "Erlangen légifotó (2016. 5,0 cm)"
 
 msgid "Erlangen aerial imagery (2013 6.25 cm)"
 msgstr "Erlangen légifelvétel (2013 6.25 cm)"
 
 msgid "Erlangen aerial imagery (2011 5.0 cm)"
-msgstr ""
+msgstr "Erlangen légifotó (2011. 5,0 cm)"
 
 msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
 msgstr "Zwenkau régi térképe - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
@@ -16469,6 +16537,9 @@ msgstr "Drón ábrázolás 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drónos légifelvétel Canaan (Haiti) 2015 november"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortofotó 2000"
 
@@ -16485,7 +16556,7 @@ msgid "Törökbálint ortophoto 2013"
 msgstr "Törökbálint ortofotó 2013"
 
 msgid "5 cm resolution bald image"
-msgstr ""
+msgstr "5 cm felbontású csupasz kép"
 
 msgid "Törökbálint ortophoto 2015"
 msgstr "Törökbálint ortofotó 2015"
@@ -16763,18 +16834,6 @@ msgstr "Freemap.sk Kerékpár"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Sí"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Városi Atlasz"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakia Történelmi Térképek"
 
@@ -16784,6 +16843,9 @@ msgstr "RABA-KGZ: Szlovénia szántóföld"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Szlovénia beépített területek"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "City of Cape Town 2015 Aerial"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
@@ -16830,10 +16892,10 @@ msgid "Stadt Zürich Luftbild 2011"
 msgstr "Stadt Zürich Luftbild 2011"
 
 msgid "Aerial imagery canton Solothurn RGB (SOGIS 2013/2014/2015)"
-msgstr ""
+msgstr "Légifotó Solothurn kanton RGB (SOGIS 2013/2014/2015)"
 
 msgid "Aerial imagery canton Solothurn Infrared (SOGIS 2013/2014/2015)"
-msgstr ""
+msgstr "Légifotó Solothurn kanton, infravörös (SOGIS 2013/2014/2015)"
 
 msgid "Canton de Génève 5cm (SITG 2011)"
 msgstr "Canton de Génève 5cm (SITG 2011)"
@@ -16916,6 +16978,9 @@ msgstr "U.S. erdőgazdasági utak"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Ortofotó térkép 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Ukrajna - Kijev 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "7. sorozat (OS7)"
 
@@ -17196,16 +17261,16 @@ msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
 msgstr ""
-"Egyszerűsített dialógus ablakba csoportosítja a Cím Interpoláció bemeneteit, "
-"valamint lehetőséget ad egy útból egyedülálló házszámokat generálni, "
+"Egyszerű dialógusablakba csoportosítja a lakcím-interpoláció bemeneteit, "
+"valamint lehetőséget ad egy útból önálló házszámokat generálni, "
 "automatikusan."
 
 msgid ""
 "Makes a pair of selected way segments parallel by rotating one of them "
 "around a chosen pivot."
 msgstr ""
-"Két kijelölt vonalszakaszt párhuzamosít úgy, hogy az egyiket annak egy "
-"kijelölt pontja körül párhuzamosba fordítja."
+"Két kijelölt vonalszakaszt párhuzamosít úgy, hogy elforgatja az egyiket "
+"annak egy kijelölt pontja körül."
 
 msgid ""
 "Provides Apache Commons library components. Not meant to be installed "
@@ -17228,14 +17293,16 @@ msgid ""
 "polygon. Built to ease mapping of building from background layers. Optimized "
 "for basemap.at."
 msgstr ""
-"Elősegíti egy rétegben a területek kijelölését és egy vonal poligon "
-"automatikus létrehozását. Épületek könnyű feltérképezésére készült a háttér "
-"rétegekre építve. A basemap.at-ra van optimalizálva."
+"Lehetővé teszi területek kijelölését egy rétegen és sokszögvonalak "
+"automatikus létrehozását. Épületek háttérképről való átrajzolásának "
+"könnyítése céljából készült. A basemap.at-ra van optimalizálva."
 
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
 msgstr ""
+"Lehetővé teszi a az épületek szögeinek 90°-osra korrigálását és az összes "
+"betöltött épület igazítását a legközelebbi úthoz."
 
 msgid "Tools for drawing buildings."
 msgstr "Eszköz épületek rajzolásához."
@@ -17279,7 +17346,7 @@ msgstr ""
 
 msgid "(Warning: Experimental!) Tool for conflating (merging) data."
 msgstr ""
-"(Figyelem! Kísérleti!) Eszöz az adatok egyesítésére (összefésülésére)."
+"(Figyelem, kísérleti!) Eszköz az adatok egyesítésére (összefésülésére)."
 
 msgid "Downloads new data when you pan/zoom"
 msgstr "Új adatokat tölt le amikor mozgatod a térképet vagy zoomolsz"
@@ -17288,13 +17355,12 @@ msgid "Create a grid of ways."
 msgstr "Vonalak hálózatát hozza létre."
 
 msgid "Customization of public transport stops."
-msgstr ""
+msgstr "Tömegközlekedési megállók testreszabása."
 
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
-"Létrehozza és kezeli a lakcímmel ellátott pontokat és épületeket a Cseh "
-"Köztársaságban."
+"Lakcím pontok és épületek létrehozása és kezelése a Cseh Köztársaságban."
 
 msgid ""
 "Allows to import various file formats into JOSM directly. Currently "
@@ -17304,7 +17370,7 @@ msgstr ""
 "Jelenleg támogatva: TangoGPS, Garmin Trainings Center TCX."
 
 msgid "Download your GPX tracks from openstreetmap.org"
-msgstr "Letölti a GPX nyomvonalaid az openstreetmap.org-ról"
+msgstr "Saját GPX nyomvonalaid letöltése az openstreetmap.org-ról"
 
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -17316,12 +17382,15 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "OSM adatokat tölt le egy vonal mentén."
 
+msgid "Dxf Import"
+msgstr "Dxf Import"
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
 msgstr ""
-"Lehetővé teszi a felhasználónak, hogy anonimizálja az időbéllyegeket és "
-"nagyon gyorsan törölhesse nagy GPX nyomvonalak részleteit."
+"Lehetővé teszi GPX nyomvonalak időbélyegeinek anonimizálását és darabjainak "
+"gyors törlését."
 
 msgid ""
 "Provides the EJML library for other JOSM plugins. Not meant to be installed "
@@ -17333,14 +17402,13 @@ msgstr ""
 
 msgid "Shows the elevation profile and some statistical data of a GPX track."
 msgstr ""
-"Egy GPX nyomvonal tengerszint feletti magasság profilját és néhány "
-"statisztikai adatot mutat meg."
+"GPX nyomvonal szintmetszetét és néhány statisztikai adatát jeleníti meg."
 
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "A Francia EPCI-k kezelése (boundary=local_authority)"
 
 msgid "Use external scripts in JOSM"
-msgstr "Külső szkriptek használata a JOSM-ban"
+msgstr "Külső szkriptek használata a JOSM-ben"
 
 msgid "Fast drawing ways by mouse"
 msgstr "Vonalak gyors rajzolása egérrel"
@@ -17352,17 +17420,17 @@ msgstr ""
 msgid ""
 "Talk with users editing the map nearby, be notified when someone comes close."
 msgstr ""
-"Társalgás a közelben térképet szerkesztő felhasználókkal, értesítsen amikor "
+"Társalgás a közelben térképet szerkesztő felhasználókkal, értesítés amikor "
 "valaki közelebb jön."
 
 msgid "Allows you to view a GeoJSON file as a layer."
-msgstr ""
+msgstr "Lehetővé teszi GeoJSON fájlok megtekintését rétegként."
 
 msgid ""
 "Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
 "be installed directly by users, but rather as a dependency for other plugins."
 msgstr ""
-"A GeoTools gyűjtemény egyes részeit teszi elérhetővé más JOSM bővítmények "
+"A GeoTools könyvtár egyes részeit teszi elérhetővé más JOSM bővítmények "
 "számára. Ez nem jelenti azt, hogy a felhasználónak közvetlenül kell "
 "telepítenie, mivel ez inkább egy működési előfeltétel, függőség más "
 "bővítmények részére."
@@ -17370,20 +17438,20 @@ msgstr ""
 msgid ""
 "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
-"GPS pontok letöltése a Globalsat dg100 nyomvonal rögzítőről, közvetlenül a "
-"JOSM-ba."
+"GPS pontok letöltése a Globalsat dg100 nyomvonalrögzítőről, közvetlenül a "
+"JOSM-be."
 
 msgid ""
 "Analyse a set of GPS points to obtain its centre and direction of spread."
 msgstr ""
-"A GPS pontok egy halmazát elemzi, hogy meghatározza a halmaz középpontját és "
-"a szórás irányát."
+"Elemzi a GPS pontok egy halmazát, és meghatározza belőle a halmaz "
+"középvonalát és a terjedelem irányát."
 
 msgid "Allows to filter out unnecessary GPS tracks"
 msgstr "Lehetővé teszi a szükségtelen GPS nyomvonalak kiszűrését"
 
 msgid "Visualizes routing information as a routing graph."
-msgstr "Útvonal grafikonként jelenít meg útvonal információkat."
+msgstr "Útvonaltervezési adatokat jelenít meg útvonalgráfként."
 
 msgid ""
 "Provides the GSON library for other JOSM plugins. Not meant to be installed "
@@ -17397,7 +17465,7 @@ msgid "Simple tool to tag house numbers."
 msgstr "Egyszerűsítő eszköz a házszámok címkézéséhez."
 
 msgid "Generate Imagery XML bounds from a multipolygon"
-msgstr "Imagery XML határvonalakat generál multipoligonból"
+msgstr "Légifelvétel XML határvonalakat generál multipoligonból"
 
 msgid ""
 "Database of imagery offsets: share and aquire imagery offsets with one "
@@ -17407,7 +17475,7 @@ msgstr ""
 "vele, vagy megosztani másokkal."
 
 msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin stílusú ábra beállító térképmód"
+msgstr "WMSPlugin-stílusú légifelvétel igazító térképmód"
 
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -17419,25 +17487,27 @@ msgstr ""
 "egyezik egy kép fájlnevével."
 
 msgid "Plugin for importing spatial referenced images"
-msgstr "Bővítmény a térbeli hivatkozásokkal ellátott képek betöltésére"
+msgstr "Bővítmény georeferált képek betöltésére"
 
 msgid "Import vector graphics (SVG)"
 msgstr "Vektorgrafikák importálása (SVG)"
 
 msgid "This plugin simplifies the mapping and editing of indoor corridors."
-msgstr ""
+msgstr "A bővítmény leegyszerűsíti a beltéri folyosók térképezését."
 
 msgid ""
 "Gives assistance for the mapping process of indoor OSM building data. "
 "Includes a validator and a mappaint style for indoor-data."
 msgstr ""
+"Segítséget nyújt a beltéri OSM épületadatok térképezésében. Tartalmaz "
+"hibakeresőt és térkép megjelenítési stílust is a beltéri adatokhoz."
 
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
 "trackpoint info"
 msgstr ""
-"Extra információk az aktuális réteg felbukkanó objektumairól - jelenleg ez "
-"egy GPX nyomvonal információ"
+"Extra információk az aktuális réteg objektumairól egy popup ablakban – "
+"jelenleg a GPX nyomvonal pontokról"
 
 msgid "A helper for IRS satellite adjustment."
 msgstr "Segítség az IRS műhold kalibrálásához."
@@ -17465,17 +17535,18 @@ msgid ""
 "creates a channel digraph and checks a subset of channels if it is a "
 "junction or searches in a subset of channels for junctions"
 msgstr ""
-"útvonal digrammát készít és ellenőrzi az utak részhalmazának kereszteződését "
-"vagy az utak részhalmazában kereszteződések után keres"
+"irányított csatornagráfot készít és ellenőrzi a csatornák részhalmazát, hogy "
+"csomópont-e, vagy csomópontot keres a csatornák részhalmazában"
+
+msgid "Tools to help import Kartverket N50"
+msgstr "Kartverket N50 importálást könnyítő eszköz"
 
 msgid "Helps vectorizing WMS images."
 msgstr "WMS képek vektorizálását segíti."
 
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
-msgstr ""
-"Támogatja az élő GPS bemenetet (mozgó pont), egy GPSD szerver kapcsolaton "
-"keresztül."
+msgstr "Élő GPS bemenet (mozgó pont) támogatás gpsd szerveren keresztül."
 
 msgid ""
 "Provides the Log4j library for other JOSM plugins. Not meant to be installed "
@@ -17490,9 +17561,9 @@ msgid ""
 "create, close,invalidate, re-open and comment bug reports by using this "
 "plugin."
 msgstr ""
-"A MapDust bővítmény MapDust hibajelentéseket jelenít meg a térképen. "
-"Létrehozhatja, lezárhatja, érvénytelenítheti, újranyithatja ezeket és hozzá "
-"is szólhat a hibajelentésekhez ennek a bővítménynek a használatával."
+"A MapDust bővítmény MapDust hibajelentéseket jelenít meg a térképen. A "
+"bővítmény használatával létrehozhatod, lezárhatod, érvénytelenítheted, "
+"újranyithatod ezeket és hozzá is szólhatsz a hibajelentésekhez."
 
 msgid "Allows the user to work with pictures hosted at mapillary.com"
 msgstr "Lehetővé teszi a mapillary.com fotóinak használatát"
@@ -17502,13 +17573,13 @@ msgid ""
 "segments, area surrounded by a (simple) closed way and create measurement "
 "paths (which also can be imported from a gps layer)."
 msgstr ""
-"Mérési dialógus ablakot, réteget nyújt a szakaszok hosszának és szögének "
+"Mérési dialógusablakot és réteget biztosít a szakaszok hosszának és szögének "
 "méréséhez valamint területekhez, amelyek zárt vonalakkal (egyszerű poligon) "
 "vannak körbehatárolva, mérési útvonalat hoz létre (amely szintén lehet GPS "
 "rétegből importált is)."
 
 msgid "Merge overlapping part of ways."
-msgstr "Utak átfedő szakaszait fésüli össze."
+msgstr "Utak átfedő szakaszait egyesíti."
 
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Balra kanyarodási korlátozást ad hozzá 4 vagy 5 út halmazához."
@@ -17526,23 +17597,23 @@ msgid ""
 "(KWallet and gnome-keyring are supported.)"
 msgstr ""
 "Használd a rendszered jelszókezelőjét az API felhasználónév és jelszó "
-"tárolására. (a KWallet és a gnome-keyring vannak támogatva.)"
+"tárolására. (A KWallet és a gnome-keyring támogatottak.)"
 
 msgid ""
 "Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
 "and is hard to rid of)"
 msgstr ""
-"Örökre ellehetetleníti a JOSM használatát (FIGYELEM: ez a bővítmény megelőzi "
-"a JOSM betöltését és igen nehéz tőle megszabadulni)"
+"Örökre ellehetetleníti a JOSM használatát (FIGYELEM: ez a bővítmény "
+"megakadályozza a JOSM betöltését és igen nehéz tőle megszabadulni)"
 
 msgid "Import OSM data in o5m format"
-msgstr ""
+msgstr "o5m formátumú OSM adatokat importál"
 
 msgid "Convert data from Open Data portals to OSM layer"
 msgstr "Adatokat konvertál be az Open Data portálokról egy OSM rétegre"
 
 msgid "extended options for editing opening_hours"
-msgstr "A nyitvatartási idő szerkesztés lehetőségeinek kiterjesztése"
+msgstr "A nyitvatartási idő szerkesztési lehetőségeinek kiterjesztése"
 
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -17553,15 +17624,14 @@ msgstr ""
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
-"Elindítja a FireFox-ot az éppen látható képernyőterület csinos SVG képként "
-"való megjelenítéséhez."
+"Elindítja a FireFox-ot és megjeleníti az éppen látható képernyőterület "
+"csinos SVG képként."
 
 msgid ""
 "Bring in errors from Osm Inspector and display it on the current JOSM "
 "bounding box"
 msgstr ""
-"Hibákat hív be az OSM Inspector-ból és megjeleníti az aktuális JOSM "
-"kijelölési területen."
+"Hibákat hív be az OSM Inspectorból és megjeleníti az aktuális JOSM nézetben."
 
 msgid ""
 "Recommends categories/tags on newly created OSM entities by analysing "
@@ -17569,7 +17639,7 @@ msgid ""
 msgstr ""
 
 msgid "Import/export OSM data in PBF format"
-msgstr "OSM adatok betöltése és kiöntése PBF formátumban."
+msgstr "OSM adatok importálása és exportálása PBF formátumból/-ba."
 
 msgid "Import PDF file and convert to ways."
 msgstr "PDF fájl importálása és vonalakká konvertálása."
@@ -17578,8 +17648,8 @@ msgid ""
 "Write gps position info to the image file header. Run this feature from the "
 "right click menu of the image layer."
 msgstr ""
-"A képfájl fejlécébe ír információt a GPS pozícióról. Ezt a funkciót a kép "
-"réteg jobb klikk menüjéből lehet futtatni."
+"Beleírja a kép fejlécébe a GPS pozíciót. Ezt a funkciót a kép réteg jobb "
+"klikk menüjéből lehet futtatni."
 
 msgid "Make photos movable and position them on the map."
 msgstr "A fotókat mozgathatóvá teszi és pozícionálja őket a térképen."
@@ -17592,7 +17662,7 @@ msgstr ""
 "szerkesztőben és annak térképhez igazítását."
 
 msgid "The great JGoodies Plastic Look and Feel."
-msgstr "A nagyszerű JGoodies Plastic Look and Feel."
+msgstr "A nagyszerű JGoodies Plastic kinézet és működés."
 
 msgid ""
 "Shows an additional information about point on map. There is only a Czech "
@@ -17602,15 +17672,17 @@ msgstr ""
 "Cseh RUIAN modul érhető el."
 
 msgid "Read and write osmosis poly filter files"
-msgstr "Osmosis poligon szűrő fájlok olvasása és írása"
+msgstr "Osmosis poligon szűrőfájlok olvasása és írása"
 
 msgid "Adds map printing to JOSM"
-msgstr "Térképnyomtatást ad a JOSM-hoz"
+msgstr "Térképnyomtatási képességet ad a JOSM-hez"
 
 msgid ""
 "Provides validation and fixing for public transport route according to "
 "version 2 of the public transport schema"
 msgstr ""
+"Validációs és javítási lehetőséget biztosít a tömegközlekedési útvonalakhoz "
+"a tömegközlekedési séma 2-es verziójának megfelelően"
 
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -17625,12 +17697,14 @@ msgid ""
 "The RasterFiltersPlugin allows to choose and apply some images'' filters to "
 "some layers"
 msgstr ""
+"A RasterFiltersPlugin lehetővé teszi szűrőeffektusok alkalmazását néhány "
+"rétegen"
 
 msgid "Relation and multipolygon creating and editing panel."
 msgstr "Kapcsolat és multipoligon készítő, szerkesztő panel."
 
 msgid "Plugin for reverting changesets"
-msgstr "Bővítmény a módosítási csomagok visszahozására"
+msgstr "Bővítmény módosításcsomagok visszavonásához"
 
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -17638,38 +17712,43 @@ msgid ""
 "properties window. Available country presets: Belgium, Germany, Poland, "
 "Slovakia, Spain."
 msgstr ""
+"Bővítmény objektumok címkézéséhez közlekedési jelzőtáblák alapján.  A "
+"dialógus a tulajdonságok ablak jobb felső sarkában lévő ikonra kattintva "
+"lehet megnyitni. Elérhető ország készletek: Belgium, Németország, "
+"Lengyelország, Szlovákia, Spanyolország"
 
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
 "defined in routes.xml file in plugin directory"
 msgstr ""
-"Útvonalakat generál (busz, túraútvonal, kerékpárutak, ...). Az útvonal "
+"Útvonalakat rajzol (busz, túraútvonal, kerékpárutak, ...). Az útvonal "
 "típusoknak a bővítmény könyvtárban található routes.xml-ben kell definiálva "
 "lenniük."
 
 msgid "Provides routing capabilities."
-msgstr "Útvonal tervezési képességet nyújt"
+msgstr "Útvonaltervezési képességet nyújt"
 
 msgid "Loads data from SDS"
-msgstr "Adatbetöltés az SDS-ből"
+msgstr "Adatbetöltés SDS-ből"
 
 msgid "Imagery Layer for Sea Charts"
-msgstr ""
+msgstr "Légifelvétel réteg hajózási térképekhez"
 
 msgid "Edit features for Sea Charts"
-msgstr ""
+msgstr "Szerkesztőeszközök hajózási térképekhez"
 
 msgid ""
 "Gives user more tools that facilitate aligning and rotation of buildings."
 msgstr ""
+"További eszközöket biztosít az épületek igazításához és forgatásához."
 
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
 "constrained by maximum removed area size. Also average nearby nodes."
 msgstr ""
 "Területeket egyszerűsít azáltal, hogy a nagyon tompa szögekben lévő pontokat "
-"távolít el. Ez korlátok közé szorítható az így eltávolított terület méret "
-"maximalizálásával. A közeli pontokat is átlagolja."
+"távolít el. Ez korlátozható a maximálisan eltávolítandó terület méretével. A "
+"közeli pontokat is átlagolja."
 
 msgid "Edit features for OpenSeaMap"
 msgstr "OpenSeaMap tulajdonságok szerkesztése"
@@ -17681,8 +17760,8 @@ msgid ""
 "Allows to edit traffic information and export it to the urban mobility "
 "simulator SUMO"
 msgstr ""
-"Lehetővé teszi a közlekedési információk szerkesztését és kiöntését a városi "
-"mobilitás szimulátor (SUMO) részére"
+"Lehetővé teszi a közlekedési információk szerkesztését és exportálását a "
+"városi mobilitás szimulátor (SUMO) részére"
 
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
@@ -17696,23 +17775,31 @@ msgstr ""
 "az ismert címkék alapján, mint például a Wikipédia"
 
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
-"Dialógus ablakot nyújt a címkék négyzethálós elrendezésben való "
-"szerkesztéséhez."
+msgstr "Dialógusablakot nyújt a címkék táblázatban való szerkesztéséhez."
 
 msgid ""
 "Adds a tagging preset tester to the windows menu, which helps you developing "
 "of tagging presets (quick preview of the dialog that will popup). You can "
 "start the jar-file as standalone as well."
 msgstr ""
+"Címkekészlet tesztelőt ad az Ablakok menübe, ami segít a címkekészletek "
+"fejlesztésénél (az előugró dialógusablak előnézetét mutatja). Indíthatod a "
+"jar-fájlt önállóan is."
 
 msgid "Make terraced houses out of single blocks."
 msgstr "Szimpla blokkokból készít teraszos házakat."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
+"A to-fix (http://osmlab.github.io/to-fix/) intergrálása JOSM-be OSM hibák "
+"javításához"
 
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -17733,12 +17820,15 @@ msgid ""
 "Traces buildings and other shapes from a map. Needs Tracer2Server to be "
 "running."
 msgstr ""
-"Épületeket és más alakzatokat rajzol át egy térképről. Tracer2Server "
-"szükséges a futtatásához."
+"Épületeket és más alakzatokat rajzol át egy térképről. A Tracer2Servernek "
+"futnia kell hozzá."
 
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Bővítmény az OSM adatok digitális aláírására"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17748,7 +17838,9 @@ msgstr ""
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
-msgstr "Kanyarodási korlátozások létrehozása és kezelése pár kattintással."
+msgstr ""
+"A turnrestrictions bővítmény lehetővé teszi kanyarodási korlátozások "
+"létrehozását, azok adatainak megadását."
 
 msgid "Allows undeleting object from OSM database"
 msgstr ""
@@ -17762,9 +17854,9 @@ msgid ""
 "georeferenced video against a GPS track, to use it for identify visible "
 "objects."
 msgstr ""
-"(Ez a bővítmény jelenleg még fejlesztés alatt van!!!) Összekapcsol és "
-"szinkronizál egy földrajzi hivatkozásokkal ellátott videót egy GPS "
-"nyomvonallal, így használható vizuálisan azonosítható objektumokhoz."
+"(Ez a bővítmény jelenleg még fejlesztés alatt áll!!!) Összekapcsol és "
+"szinkronizál egy georeferált videót egy GPS nyomvonallal, így használható "
+"objektumok vizuális azonosításához."
 
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17775,7 +17867,7 @@ msgstr ""
 "hibákat tartalmazhat."
 
 msgid "Easy downloading along a long set of interconnected ways"
-msgstr "Nagy halom, hosszában kapcsolódó vonal könnyített letöltése."
+msgstr "Letöltés egyszerűen, egy csatlakozó vonalsorozat mentén."
 
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "Lehetővé teszi GPX fájlból betöltött útpontok keresését."
@@ -17783,6 +17875,8 @@ msgstr "Lehetővé teszi GPX fájlból betöltött útpontok keresését."
 msgid ""
 "Simplifies linking OSM objects to Wikipedia articles and Wikidata items"
 msgstr ""
+"Egyszerűsíti az OSM objektumok összekapcsolását Wikipédia cikkekkel és "
+"Wikidata elemekkel"
 
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -17906,6 +18000,10 @@ msgid "No wheeled vehicle"
 msgstr "Kerekes járművel nem járható"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "sportpálya"
 
@@ -18020,19 +18118,19 @@ msgstr "Villamosítás"
 
 msgctxt "electrified"
 msgid "contact_line"
-msgstr ""
+msgstr "felsővezeték"
 
 msgctxt "electrified"
 msgid "no"
-msgstr ""
+msgstr "nem"
 
 msgctxt "electrified"
 msgid "yes"
-msgstr ""
+msgstr "igen"
 
 msgctxt "electrified"
 msgid "rail"
-msgstr ""
+msgstr "sín"
 
 msgid "Voltage in Volts (V)"
 msgstr "Feszültség Volt-ban (V)"
@@ -18150,7 +18248,7 @@ msgid "sushi"
 msgstr "szusi"
 
 msgid "steak_house"
-msgstr ""
+msgstr "steak-ház"
 
 msgid "fish_and_chips"
 msgstr "fish and chips"
@@ -18183,7 +18281,7 @@ msgid "noodle"
 msgstr "tészta"
 
 msgid "barbecue"
-msgstr ""
+msgstr "barbecue"
 
 msgid "vegetarian"
 msgstr "vegetáriánus"
@@ -18356,7 +18454,7 @@ msgstr "modellrepülőtér"
 
 msgctxt "sport"
 msgid "motocross"
-msgstr ""
+msgstr "motokrossz"
 
 msgctxt "sport"
 msgid "motor"
@@ -19234,6 +19332,9 @@ msgstr "épülő"
 msgid "Ford"
 msgstr "Gázló"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Egyéb utak"
 
@@ -19247,31 +19348,32 @@ msgid "grade1"
 msgstr "1. osztály"
 
 msgid "Solid: paved or heavily compacted hardcore surface"
-msgstr ""
+msgstr "Szilárd: burkolt, vagy erősen tömörített, kemény felült"
 
 msgid "grade2"
 msgstr "2. osztály"
 
 msgid "Mostly Solid: gravel/rock with some soft material mixed in"
-msgstr ""
+msgstr "Nagyrészt szilárd: kavics, kő egy kevés belekevert lágy anyaggal"
 
 msgid "grade3"
 msgstr "3. osztály"
 
 msgid "Even mixture of hard and soft materials"
-msgstr ""
+msgstr "Kemény és lágy anyagok keveréke"
 
 msgid "grade4"
 msgstr "4. osztály"
 
 msgid "Mostly Soft: soil/sand/grass with some hard material mixed in"
 msgstr ""
+"Nagyrészt lágy: talaj, homok, fű, egy kevés belekevert kemény anyaggal"
 
 msgid "grade5"
 msgstr "5. osztály"
 
 msgid "Soft: soil/sand/grass"
-msgstr ""
+msgstr "Lágy: talaj, homok, fű"
 
 msgid "MTB Scale"
 msgstr "MTB skála"
@@ -19787,7 +19889,7 @@ msgid "Kerb"
 msgstr "Szegély"
 
 msgid "Tactile paving"
-msgstr ""
+msgstr "Taktilis burkolat"
 
 msgid "Entrance (Barrier Opening)"
 msgstr "Sorompós bejárat"
@@ -19968,10 +20070,10 @@ msgid "river"
 msgstr "folyó"
 
 msgid "lock"
-msgstr ""
+msgstr "zsilip"
 
 msgid "wastewater"
-msgstr ""
+msgstr "szennyvíz"
 
 msgid "Salt Water"
 msgstr "Sós víz"
@@ -20507,70 +20609,70 @@ msgid "Amperage"
 msgstr "Áramerősség"
 
 msgid "Types of vehicles which can be charged:"
-msgstr ""
+msgstr "Tölthető járműtípusok:"
 
 msgid "Scooter"
-msgstr ""
+msgstr "Robogó"
 
 msgid "Truck"
-msgstr ""
+msgstr "Teherautó"
 
 msgid "Number of Sockets:"
-msgstr ""
+msgstr "Aljzatok száma:"
 
 msgid "Type 1 (Yazaki)"
-msgstr ""
+msgstr "Type 1 (Yazaki)"
 
 msgid "Type 1 Combo"
-msgstr ""
+msgstr "Type 1 Combo"
 
 msgid "Type 2 (Mennekes)"
-msgstr ""
+msgstr "Type 2 (Mennekes)"
 
 msgid "Type 2 Combo"
-msgstr ""
+msgstr "Type 2 Combo"
 
 msgid "Type 3 (SCAME)"
-msgstr ""
+msgstr "Type 3 (SCAME)"
 
 msgid "CHAdeMO"
-msgstr ""
+msgstr "CHAdeMO"
 
 msgid "Tesla Supercharger"
-msgstr ""
+msgstr "Tesla Supercharger"
 
 msgid "Schuko"
-msgstr ""
+msgstr "Schuko"
 
 msgid "CEE blue"
-msgstr ""
+msgstr "CEE kék"
 
 msgid "CEE red 16A"
-msgstr ""
+msgstr "CEE piros 16A"
 
 msgid "CEE red 32A"
-msgstr ""
+msgstr "CEE piros 32A"
 
 msgid "NEMA 5-15"
-msgstr ""
+msgstr "NEMA 5-15"
 
 msgid "NEMA 5-20"
-msgstr ""
+msgstr "NEMA 5-20"
 
 msgid "Authentication:"
-msgstr ""
+msgstr "Felhasználóazonosítás"
 
 msgid "Phone call"
-msgstr ""
+msgstr "Telefonhívás"
 
 msgid "Short message"
-msgstr ""
+msgstr "SMS"
 
 msgid "NFC"
-msgstr ""
+msgstr "NFC"
 
 msgid "Membership card"
-msgstr ""
+msgstr "Tagsági kártya"
 
 msgid "Wash"
 msgstr "Autómosó"
@@ -20870,6 +20972,9 @@ msgstr "Kifutópálya"
 msgid "Taxiway"
 msgstr "Gurulóút"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Helikopter-leszállóhely"
 
@@ -21185,7 +21290,7 @@ msgid "Water Park"
 msgstr "Akvapark"
 
 msgid "Beach Resort"
-msgstr ""
+msgstr "Tengerparti üdülőhely"
 
 msgid "Swimming Pool"
 msgstr "Úszómedence"
@@ -21546,11 +21651,11 @@ msgstr "Pont száma"
 msgid "Point Name"
 msgstr "Pont neve"
 
-msgid "Phone Number"
-msgstr "Telefonszám"
+msgid "Emergency Phone Number"
+msgstr "Vészhelyzeti telefonszám"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Használj nemzetközi kódot, mint +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr "(A táblán látható számot használd.)"
 
 msgid "Veterinary"
 msgstr "Állatorvos"
@@ -21564,6 +21669,12 @@ msgstr "Mentőállomás"
 msgid "Automated Defibrillator"
 msgstr "Automata defibrillátor"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Telefonszám"
+
 msgid "Located inside a building?"
 msgstr "Épületen belül van elhelyezve?"
 
@@ -21998,7 +22109,7 @@ msgid "Sports Centre"
 msgstr "Sportközpont"
 
 msgid "Fitness Centre"
-msgstr ""
+msgstr "Fitneszközpont"
 
 msgid "Pitch"
 msgstr "Sportpálya"
@@ -22030,7 +22141,7 @@ msgid "Hole"
 msgstr "Lyuk (szakasz)"
 
 msgid "Par"
-msgstr ""
+msgstr "Par"
 
 msgid "Handicap rating"
 msgstr "Handicap érték"
@@ -22087,7 +22198,7 @@ msgstr "sportközpont"
 
 msgctxt "running"
 msgid "fitness_centre"
-msgstr ""
+msgstr "fitneszközpont"
 
 msgctxt "running"
 msgid "stadium"
@@ -22147,7 +22258,7 @@ msgid "Gymnastics"
 msgstr "Torna"
 
 msgid "fitness_centre"
-msgstr ""
+msgstr "fitneszközpont"
 
 msgid "Ice Skating"
 msgstr "Jégkorcsolya"
@@ -22434,6 +22545,10 @@ msgid "university"
 msgstr "egyetem"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "kórház"
 
@@ -22518,6 +22633,10 @@ msgid "public"
 msgstr "nyilvános"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "rom"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Szintek"
 
@@ -22654,7 +22773,7 @@ msgstr "szennyvíz"
 
 msgctxt "content"
 msgid "silage"
-msgstr ""
+msgstr "siló"
 
 msgctxt "content"
 msgid "slurry"
@@ -23026,13 +23145,13 @@ msgid "Bunker"
 msgstr "Bunker"
 
 msgid "pillbox"
-msgstr ""
+msgstr "géppuskafészek"
 
 msgid "munitions"
-msgstr ""
+msgstr "lőszer"
 
 msgid "hardened_aircraft_shelter"
-msgstr ""
+msgstr "erődített repülőgép rejtek"
 
 msgctxt "bunker"
 msgid "underground"
@@ -23847,10 +23966,10 @@ msgid "Deli (Fine Food)"
 msgstr "Delikatesz bolt"
 
 msgid "Pastry"
-msgstr ""
+msgstr "Cukrászsütemény"
 
 msgid "Confectionery"
-msgstr ""
+msgstr "Cukrászda"
 
 msgid "Tea"
 msgstr "Tea"
@@ -23955,7 +24074,7 @@ msgid "Kitchen"
 msgstr "Konyhafelszerelés bolt"
 
 msgid "Houseware"
-msgstr ""
+msgstr "Háztartás"
 
 msgid "Curtain"
 msgstr "Függönybolt"
@@ -23994,7 +24113,7 @@ msgid "Ticket"
 msgstr "Jegy"
 
 msgid "For the body"
-msgstr ""
+msgstr "Szépségápolás"
 
 msgid "Chemist"
 msgstr "Drogéria"
@@ -24015,13 +24134,13 @@ msgid "Hairdresser/Barber"
 msgstr "Fodrász/Borbély"
 
 msgid "Female"
-msgstr ""
+msgstr "Női"
 
 msgid "Male"
-msgstr ""
+msgstr "Férfi"
 
 msgid "Unisex"
-msgstr ""
+msgstr "Uniszex"
 
 msgid "Tattoo"
 msgstr "Tetoválószalon"
@@ -24102,10 +24221,10 @@ msgid "Vending products"
 msgstr "Árusított termékek"
 
 msgid "admission_tickets"
-msgstr ""
+msgstr "belépőjegy"
 
 msgid "animal_feed"
-msgstr ""
+msgstr "állateledel"
 
 msgid "bicycle_tube"
 msgstr "kerékpárgumi"
@@ -24120,7 +24239,7 @@ msgid "drinks"
 msgstr "italok"
 
 msgid "elongated_coin"
-msgstr ""
+msgstr "emlékérme"
 
 msgid "excrement_bags"
 msgstr "ürülékgyűjtő zacskó"
@@ -24129,7 +24248,7 @@ msgid "food"
 msgstr "étel"
 
 msgid "milk"
-msgstr ""
+msgstr "tej"
 
 msgid "newspapers"
 msgstr "újság"
@@ -24138,10 +24257,10 @@ msgid "parking_tickets"
 msgstr "parkolójegy"
 
 msgid "parcel_pickup"
-msgstr ""
+msgstr "csomagfelvétel"
 
 msgid "parcel_mail_in"
-msgstr ""
+msgstr "csomagfeladás"
 
 msgid "photos"
 msgstr "fénykép"
@@ -24314,16 +24433,16 @@ msgid "Government"
 msgstr "Állami intézmény"
 
 msgid "ministry"
-msgstr ""
+msgstr "minisztérium"
 
 msgid "prosecutor"
-msgstr ""
+msgstr "ügyészség"
 
 msgid "tax"
-msgstr ""
+msgstr "adóhatóság"
 
 msgid "register_office"
-msgstr ""
+msgstr "anyakönyvi hivatal"
 
 msgctxt "office"
 msgid "Insurance"
@@ -24632,16 +24751,16 @@ msgid "Islet"
 msgstr "Szigetecske"
 
 msgid "Reef"
-msgstr ""
+msgstr "Zátony"
 
 msgid "coral"
-msgstr ""
+msgstr "korall"
 
 msgid "oyster"
-msgstr ""
+msgstr "osztriga"
 
 msgid "rock"
-msgstr ""
+msgstr "szikla"
 
 msgid "Nature"
 msgstr "Természet"
@@ -24732,8 +24851,16 @@ msgstr "Természetvédelmi terület"
 msgid "Scree"
 msgstr "Törmeléklejtő"
 
-msgid "An accumulation of loose rocks."
-msgstr "Laza kőtörmelék felhalmozódása."
+msgid "An accumulation of loose angular rocks."
+msgstr "Lazán felhalmozódott szögletes szikladarabok."
+
+msgid "Shingle"
+msgstr "Kavicshordalék"
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
+"Lazán felhalmozódott, lekerekített kavicsok, jellemzően tengerparton és "
+"folyómederben."
 
 msgid "Fell"
 msgstr "Kopár hegyoldal"
@@ -24898,13 +25025,13 @@ msgid "Plant Nursery"
 msgstr "Növény nevelde"
 
 msgid "Aquaculture"
-msgstr ""
+msgstr "Akvakultúra"
 
 msgid "shrimp"
-msgstr ""
+msgstr "garnéla"
 
 msgid "mussels"
-msgstr ""
+msgstr "kagyló"
 
 msgid "Allotments"
 msgstr "Telkek"
@@ -25389,7 +25516,7 @@ msgid "mindistance"
 msgstr "min távolság"
 
 msgid "check"
-msgstr ""
+msgstr "ellenőrzés"
 
 msgid "Max. height (meters, only if enforcement=maxheight)"
 msgstr "Max. magasság (méter, csak max magasság típusnál)"
@@ -25418,17 +25545,11 @@ msgstr "Útvonalak"
 msgid "Bicycle Route"
 msgstr "Kerékpár útvonal"
 
-msgid "icn"
-msgstr "Nemzetközi kerékpárút hálózat (ICN)"
-
-msgid "ncn"
-msgstr "Országos kerékpárút hálózat (NCN)"
-
-msgid "rcn"
-msgstr "Regionális kerékpárút hálózat (RCN)"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "Londoni kerékpárút hálózat (LCN)"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Hegyikerékpár útvonal"
@@ -25436,18 +25557,6 @@ msgstr "Hegyikerékpár útvonal"
 msgid "Hiking Route"
 msgstr "Túraútvonal"
 
-msgid "iwn"
-msgstr "Nemzetközi túraútvonal hálózat (IWN)"
-
-msgid "nwn"
-msgstr "Országos túraútvonal hálózat (NWR)"
-
-msgid "rwn"
-msgstr "Regionális túraútvonal hálózat (NWR)"
-
-msgid "lwn"
-msgstr "Helyi túraútvonal hálózat (LWR)"
-
 msgid "infrastructure"
 msgstr "infrastruktúra"
 
@@ -25460,18 +25569,6 @@ msgstr "Gyalogló útvonal"
 msgid "Riding Route"
 msgstr "Lovagló útvonal"
 
-msgid "ihn"
-msgstr "ihn"
-
-msgid "nhn"
-msgstr "nhn"
-
-msgid "rhn"
-msgstr "rhn"
-
-msgid "lhn"
-msgstr "lhn"
-
 msgid "Piste Route"
 msgstr "Sí útvonal"
 
@@ -25663,10 +25760,24 @@ msgstr "Páratlan házszám a páros oldali lakcím interpolációban."
 
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
+"Vonal {0} címkével. Ha lehetséges, címkézd külön az egyes házszámokat."
+
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+"Az objektumnak nincs {0} címkéje, pedig van {1} és {2}, aminek értéke "
+"házszámnak néz ki."
+
+msgid "Same value of {0} and {1}"
+msgstr "{0} és {1} értéke ugyanaz"
 
 msgid "{0} without {1}"
 msgstr "{0} {1} nélkül"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} {1} vagy {2} nélkül"
 
@@ -25676,6 +25787,12 @@ msgstr "{0} {1}, {2} vagy {3} nélkül"
 msgid "{0} together with {1}"
 msgstr "{0} együtt {1}-el"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr "két objektum, egy {0} és egy {1} + {2} + {3}"
+
 msgid "incomplete object: only {0}"
 msgstr "befejezetlen objektum: csak {0}"
 
@@ -25691,60 +25808,62 @@ msgstr "{0}, {1} címkével együtt és ellentmondó az értékük"
 msgid "{0} on suspicious object"
 msgstr "{0} gyanús objektumon"
 
-msgid "restaurant without name"
-msgstr "étterem név nélkül"
-
-msgid "{0} used with {1}"
-msgstr "{0} együtt használva {1}-el"
-
 msgid "natural water used for swimming pool"
 msgstr "úszómedencéhez használt természetes víz"
 
 msgid "sport without physical feature"
 msgstr "sport fizikai tulajdonság nélkül"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} azon a ponton kellene legyen ahol {1} és {2} kereszteződnek"
-
 msgid "alternative name without {0}"
 msgstr "alternatív név, {0} nélkül"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "a(z) {0} bejezetlen használata egy vonalon {1} nélkül"
 
-msgid "Same value of {0} and {1}"
-msgstr "{0} és {1} értéke ugyanaz"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "{0}, {1} és {2} értéke ugyanaz"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0}, {1} és {2} értéke ugyanaz és ellentmondó az értékük"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Gyanús címke kombináció: {0} és {1}"
-
 msgid "{0} on a relation without {1}"
-msgstr ""
+msgstr "{0} egy kapcsolaton {1} nélkül"
 
 msgid ""
 "Long waterway with {0} but without a tag which defines it as tunnel or "
 "underground. Remove {1} or add a tunnel tag if applicable. Also check "
 "crossing bridges and their {1} tags."
 msgstr ""
+"Hosszú vízfolyás {0} címkével, de nincs rajta címke, ami alagútként vagy "
+"földalattiként definiálná. Távolítsd el a {1} címkét vagy adj hozzá tunnel "
+"címkét, ha az való rá. Ellenőrizd a keresztező hidakat és azok {1} címkéit "
+"is."
 
 msgid ""
 "Short waterway with {0} but without a tag which defines it as tunnel or "
 "underground. Remove {1} or add a tunnel tag if applicable. Also check "
 "crossing bridges and their {1} tags."
 msgstr ""
+"Rövid vízfolyás {0} címkével, de nincs rajta címke, ami alagútként vagy "
+"földalattiként definiálná. Távolítsd el a {1} címkét vagy adj hozzá tunnel "
+"címkét, ha az való rá. Ellenőrizd a keresztező hidakat és azok {1} címkéit "
+"is."
 
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
+msgstr "{0} együtt {1} és {2} címkékkel. Távolítsd el ezeket: {1} és {2}"
+
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Sávok száma eltér {0} és {1} kulcsokban"
+
+msgid "possibly missing {0} tag"
 msgstr ""
 
 msgid "{0} is deprecated"
 msgstr "{0} elavult"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "A(z) ''{0}'' semmitmondó, használj még specifikusabb címkéket, például "
@@ -25816,11 +25935,17 @@ msgstr "Meghatározatlan címke {0}"
 msgid "Definition of {0} is unclear"
 msgstr "{0} definíciója nem világos"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} nem ajánlott. Használd a Vonal megfordítását az Eszközök menüből."
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "kulcs ritka karakterrel"
 
@@ -25836,11 +25961,11 @@ msgstr "{0} elavult, {1} helyettesíti"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} elavult. Helyette használd a(z) {1}: kulcs előtagot."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "vitatható kulcs (számra végződik): {0}"
+msgid "questionable key (ending with a number)"
+msgstr ""
 
 msgid "The key {0} has an uncommon value."
-msgstr ""
+msgstr "{0} kulcs értéke szokatlan."
 
 msgid "{0} on a node. Should be used on a way."
 msgstr "{0} egy ponton. Vonalon kellene használni."
@@ -25881,8 +26006,8 @@ msgstr "Különböző természeti területek átfednek"
 msgid "Overlapping Identical Landuses"
 msgstr "Különböző területhasználatok átfednek"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} muszáj egy vonalhoz kapcsolódjon"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "folyóvizet és hidat összekötő pont"
@@ -25913,9 +26038,14 @@ msgid ""
 "Waterway ends without a connection to another waterway or the direction of "
 "the waterway is wrong."
 msgstr ""
+"A vízfolyás nem torkollik más vízfolyásokba, vagy rossz irányban van "
+"megrajzolva."
 
 msgid "Coastline inside {1}"
-msgstr ""
+msgstr "Partvonal ezen belül: {1}"
+
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} azon a ponton kellene legyen ahol {1} és {2} kereszteződnek"
 
 msgid "abbreviated street name"
 msgstr "rövidített utca név"
@@ -25935,6 +26065,9 @@ msgstr "közút útszám nélkül"
 msgid "temporary highway type"
 msgstr "ideiglenes közút típus"
 
+msgid "{0} used with {1}"
+msgstr "{0} együtt használva {1}-el"
+
 msgid "street name contains ss"
 msgstr "az utcanév ss-t tartalmaz"
 
@@ -26036,11 +26169,14 @@ msgstr "ismeretlen zsidó gyülekezet"
 msgid "{0} is unnecessary"
 msgstr "{0} szükségtelen"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} szükségtelen a(z) {1} részére"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} értelmetlen"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Pont duplikálja a szülővonal címkéit"
@@ -26300,6 +26436,27 @@ msgstr "GPX nyomvonal feltöltés"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Nyomvonal feltöltése az openstreetmap.org-ra"
 
+msgid "Importing..."
+msgstr "Betöltés..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr "DXF fájlok [ImportDxf bővítmény] (*.dxf)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Kérlek, nyiss vagy készíts adatréteget a betöltés előtt"
+
+msgid "Import dxf"
+msgstr "Dxf importálása"
+
+msgid "Scale:"
+msgstr "Skála:"
+
+msgid "unit(s) = "
+msgstr "mértékegység(ek): "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "A magassági profil mutatása"
 
@@ -26364,7 +26521,7 @@ msgid "Max points count per 1 km"
 msgstr "Max pont szám kilométerenként"
 
 msgid "Enter key mode"
-msgstr ""
+msgstr "Enter billentyű mód"
 
 msgid "Auto add tags"
 msgstr "Címkék automatikus hozzáadása"
@@ -26397,7 +26554,7 @@ msgid "FastDraw configuration"
 msgstr "FastDraw konfigurálása"
 
 msgid "Try copying tags from properties table"
-msgstr ""
+msgstr "Próbálja meg a tulajdonság táblából másolni a címkéket"
 
 msgid "Save settings"
 msgstr "Beállítások mentése"
@@ -26412,6 +26569,9 @@ msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
 "to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line"
 msgstr ""
+"Klikk vagy klikk és húzás folytatja; Ctrl+klikk fix csomópontot ad hozzá; "
+"Shift+klikk töröl; Enter egyszerűsít és ment; Ctrl+Shift+klikk új vonalat "
+"kezd"
 
 msgid "FastDrawing"
 msgstr "Gyorsrajzolás"
@@ -26420,10 +26580,11 @@ msgid "Fast drawing mode"
 msgstr "Gyorsrajzoló mód"
 
 msgid "Please move the mouse to draw new way"
-msgstr ""
+msgstr "Új vonal rajzolásához kérlek mozgasd az egeret"
 
 msgid "Are you sure you do not want to save the line containing {0} points?"
 msgstr ""
+"Biztos vagy benne, hogy nem mented a(z) {0} pontot tartalmazó vonalat?"
 
 msgid ""
 "{0} m - length of the line\n"
@@ -26648,6 +26809,407 @@ 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 "Total images:"
+msgstr "Összes kép:"
+
+msgid "images"
+msgstr "képek"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Nem sikerült beolvasni a betűtípus fájlt innen: „{0}”"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Mapillary réteg készítése"
+
+msgid "Start Mapillary layer"
+msgstr "Mapillary réteg indítása"
+
+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 "Select pictures"
+msgstr "Képek kiválasztása"
+
+msgid "Import pictures into sequence"
+msgstr "Képek importálása sorozatba"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Képek importálása a Mapillary rétegre egy sorozatba"
+
+msgid "Join mode"
+msgstr "Összekapcsolási mód"
+
+msgid "Join/unjoin pictures"
+msgstr "Képek össze/szétkapcsolása"
+
+msgid "Join Mapillary pictures"
+msgstr "Mapillary képek összekapcsolá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 "Upload pictures"
+msgstr "Képek feltöltése"
+
+msgid "Upload Mapillary pictures"
+msgstr "Mapillary képek feltöltése"
+
+msgid "Upload pictures."
+msgstr "Képek feltöltése."
+
+msgid "Walk mode"
+msgstr "Gyalogos mód"
+
+msgid "Start walk mode"
+msgstr "Gyalogos mód indítása"
+
+msgid "Zoom to selected image"
+msgstr "Nagyítása a kiválasztott képre"
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr "Nagyítása a jelenleg kiválasztott Mapillary képre"
+
+msgid "View in website"
+msgstr "Megtekintés a weboldalon"
+
+msgid "Copy key"
+msgstr "Kulcs másolása"
+
+msgid "Copy key tag"
+msgstr "Kulcs címke másolása"
+
+msgid "Edit on website"
+msgstr "Szerkesztés a weboldalon"
+
+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 "Submit"
+msgstr "Beküldés"
+
+msgid "Export all images"
+msgstr "Összes kép exportálása"
+
+msgid "Export selected sequence"
+msgstr "Kiválasztott sorozat exportálása"
+
+msgid "Export selected images"
+msgstr "Kiválasztott képek exportálása"
+
+msgid "Rewrite imported images"
+msgstr "Importált képek átírása"
+
+msgid "Select a folder"
+msgstr "Könyvtár kiválasztása"
+
+msgid "Explore"
+msgstr "Böngészés"
+
+msgid "Select a directory"
+msgstr "Könyvtár kiválasztása"
+
+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 "Gyalogátkelő"
+
+msgid "No turn"
+msgstr "Kanyarodni 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 ablak megnyitása"
+
+msgid "Mapillary picture"
+msgstr "Mapillary kép"
+
+msgid "Open Mapillary window"
+msgstr "Mapillary ablak megnyitása"
+
+msgid "Mapillary dialog"
+msgstr "Mapillary ablak"
+
+msgid "Open Mapillary main dialog"
+msgstr "Fő Mapillary ablak megnyitása"
+
+msgid "Next picture"
+msgstr "Következő kép"
+
+msgid "Shows the next picture in the sequence"
+msgstr "A sorozat következő képére lép"
+
+msgid "Previous picture"
+msgstr "Előző kép"
+
+msgid "Shows the previous picture in the sequence"
+msgstr "A sorozat előző képére lép"
+
+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 "Login"
+msgstr "Belépés"
+
+msgid "Logout"
+msgstr "Kijelentkezés"
+
+msgid "Download mode"
+msgstr "Letöltési mód"
+
+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 "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 "Kiválasztott 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 "Kiválasztott kép követése"
+
+msgid "Go forward"
+msgstr "Menj előre"
+
+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ép összekötve"
+
+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 "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 downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+"A letöltött OSM terület túl nagy. A letöltési mód a réteg újrakezdéséig "
+"módosítva lett OSM területre."
+
+msgid "Downloading"
+msgstr "Letöltés"
+
+msgid "Select mode"
+msgstr "Kiválasztá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 "The image key ''{0}'' is invalid!"
+msgstr "A(z) „{0}” kép kulcs érvénytelen!"
+
+msgid "The image key must not be null here!"
+msgstr "A kép kulcs nem lehet null!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "A(z) „{0}” sorozat kulcs érvénytelen!"
+
+msgid "The sequence key must not be null here!"
+msgstr "A sorozat kulcs nem lehet null!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -26764,13 +27326,13 @@ msgid "Current Selected Bug Info"
 msgstr ""
 
 msgid "Prev OSMI bug"
-msgstr ""
+msgstr "Előző OSMI hiba"
 
 msgid "Next OSMI bug"
-msgstr ""
+msgstr "Következő OSMI hiba"
 
 msgid "OSM Inspector Bugs"
-msgstr ""
+msgstr "OSM Inspector Hibák"
 
 msgid "Selected Bug Info"
 msgstr ""
@@ -26779,13 +27341,13 @@ msgid "Handy Address Interpolation Functions"
 msgstr ""
 
 msgid "Define Address Interpolation"
-msgstr ""
+msgstr "Lakcíminterpoláció megadása"
 
 msgid "Odd"
-msgstr "Furcsa"
+msgstr "Páratlan"
 
 msgid "Even"
-msgstr "Még"
+msgstr "Páros"
 
 msgid "Alphabetic"
 msgstr "ABC"
@@ -26794,7 +27356,7 @@ msgid "Numeric"
 msgstr "Numerikus"
 
 msgid "Actual"
-msgstr "Aktuális"
+msgstr "Tényleges"
 
 msgid "Estimate"
 msgstr "Becslés"
@@ -26812,25 +27374,25 @@ msgid "Numbering Scheme:"
 msgstr "Számozási rend:"
 
 msgid "Increment:"
-msgstr "Növekedés:"
+msgstr "Növelés:"
 
 msgid "Starting #:"
-msgstr "Induló #:"
+msgstr "Kezdő #:"
 
 msgid "Ending #:"
-msgstr "Befejező #:"
+msgstr "Vége #:"
 
 msgid "Accuracy:"
 msgstr "Pontosság:"
 
 msgid "Convert way to individual house numbers."
-msgstr "Vonal konvertálása egyéni házszámokká."
+msgstr "Vonal konvertálása önálló házszámokká."
 
 msgid "Will associate {0} additional house number nodes"
-msgstr ""
+msgstr "Hozzá fog kapcsolni további {0} házszám pontot"
 
 msgid "City:"
-msgstr "Város:"
+msgstr "Település:"
 
 msgid "State:"
 msgstr "Állam:"
@@ -26849,42 +27411,44 @@ msgstr "Opcionális információk:"
 
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
+"Válassz egy utcát, amihez a lakcím-interpolációs vonal hozzá lesz kapcsolva"
 
 msgid "Please select address interpolation way for this street"
-msgstr ""
+msgstr "Válassz egy lakcím-interpolációs vonalat ehhez az utcához"
 
 msgid "Expected odd numbers for addresses"
-msgstr ""
+msgstr "Páratlan házszámokat vártam"
 
 msgid "Expected even numbers for addresses"
-msgstr ""
+msgstr "Páros házszámokat vártam"
 
 msgid "Expected valid number for increment"
-msgstr ""
+msgstr "A növelés értéke érvényes szám kell legyen"
 
 msgid "Country code must be 2 letters"
-msgstr ""
+msgstr "Az országkód két betűs kell legyen"
 
 msgid "Please enter valid number for starting and ending address"
-msgstr ""
+msgstr "Kérlek, a kezdő és vége házszámoknak érvényes számot adj meg"
 
 msgid "Alphabetic address must end with a letter"
-msgstr ""
+msgstr "Az ABC címek betűre kell végződjenek"
 
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
+"Az ABC rendszerű házszámok kezdő és vég számai azonosak kell legyenek"
 
 msgid "Starting address letter must be less than ending address letter"
-msgstr ""
+msgstr "A kezdő lakcím betű kisebb kell legyen a vége lakcím betűnél"
 
 msgid "Please enter valid number for starting address"
-msgstr ""
+msgstr "Kérlek, a kezdő házszámoknak érvényes számot adj meg"
 
 msgid "Please enter valid number for ending address"
-msgstr ""
+msgstr "Kérlek, a vége házszámoknak érvényes számot adj meg"
 
 msgid "Starting address number must be less than ending address number"
-msgstr ""
+msgstr "A kezdő lakcím kisebb kell legyen a vége lakcímnél"
 
 msgid "Align Way Segments"
 msgstr "Vonalszakasz igazítása"
@@ -26924,13 +27488,13 @@ msgid ""
 msgstr ""
 
 msgid "Undocumented problem occured.\n"
-msgstr ""
+msgstr "Dokumentálatlan hiba történt.\n"
 
 msgid "AlignWayS: Alignment not possible"
-msgstr ""
+msgstr "AlignWayS: Az igazítás nem lehetséges"
 
 msgid "Align way segment"
-msgstr ""
+msgstr "Vonalszakasz igazítása"
 
 msgid ""
 "Please select two segments that don''t share any nodes\n"
@@ -26938,10 +27502,10 @@ msgid ""
 msgstr ""
 
 msgid "Align Way Segments: Modes"
-msgstr ""
+msgstr "Vonalszakaszok igazítása: módok"
 
 msgid "Align Ways control panel"
-msgstr ""
+msgstr "Vonalak igazítása kezelőfelület"
 
 msgid "This panel activates in Align Ways mode:"
 msgstr ""
@@ -28247,25 +28811,25 @@ msgid "  adding {0} {1}"
 msgstr "  hozzáadás {0} {1}"
 
 msgid "EditGpx"
-msgstr ""
+msgstr "EditGpx"
 
 msgid "Layer for editing GPX tracks"
-msgstr ""
+msgstr "GPX nyomvonalak szerkesztésére szolgáló réteg"
 
 msgid "Convert to GPX layer with anonymised time"
-msgstr ""
+msgstr "Konvertálás anonimizált időbélyegű GPX-réteggé"
 
 msgid "edit gpx tracks"
 msgstr "GPX nyomvonalak szerkesztése"
 
 msgid "Import path from GPX layer"
-msgstr ""
+msgstr "Útvonal importálása GPX-rétegről"
 
 msgid "Drop existing path"
-msgstr ""
+msgstr "Meglévő útvonal elvetése"
 
 msgid "No GPX data layer found."
-msgstr ""
+msgstr "Nem található GPX-adatréteg."
 
 msgid "External tool error"
 msgstr "Külső eszköz hiba"
@@ -28330,9 +28894,6 @@ 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"
 
@@ -28365,9 +28926,6 @@ 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"
 
@@ -28375,25 +28933,25 @@ msgid "Show users on map"
 msgstr "Felhasználók mutatása a térképen"
 
 msgid "GeoJSON file"
-msgstr ""
+msgstr "GeoJSON fájl"
 
 msgid "Loading json file..."
-msgstr ""
+msgstr "JSON fájl betöltése…"
 
 msgid "Data Layer from GeoJSON: "
-msgstr ""
+msgstr "Adatréteg GeoJSON fájlból: "
 
 msgid "Error loading geojson file {0}"
-msgstr ""
+msgstr "Hiba történt a geojson fájl betöltése közben: {0}"
 
 msgid "Position only"
-msgstr ""
+msgstr "Csak pozíció"
 
 msgid "Position, Time, Date, Speed"
-msgstr ""
+msgstr "Pozíció, Idő, Dátum, Sebesség"
 
 msgid "Position, Time, Date, Speed, Altitude"
-msgstr ""
+msgstr "Pozíció, Idő, Dátum, Sebesség, Magasság"
 
 msgid "A By Time"
 msgstr ""
@@ -28486,10 +29044,10 @@ msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
 msgid "Add EGPX layer"
-msgstr ""
+msgstr "EGPX-réteg hozzáadása"
 
 msgid "GPX Data"
-msgstr ""
+msgstr "GPX-adat"
 
 msgid "Classes element below root child level"
 msgstr ""
@@ -28824,40 +29382,43 @@ msgid "Imagery XML Files"
 msgstr "Ábrázoló XML Fájlok"
 
 msgid "Save Imagery XML file"
-msgstr ""
+msgstr "Légifelvétel XML fájl mentése"
 
 msgid "XML Imagery Bounds"
-msgstr ""
+msgstr "XML légifelvétel határok"
 
 msgid "Generate Imagery XML bounds for the selection"
-msgstr ""
+msgstr "XML légifelvétel határok generálása a kijelölésből"
 
 msgid "edit bounds for selected defaults"
 msgstr ""
 
 msgid "Download imagery XML bounds"
-msgstr ""
+msgstr "XML légifelvétel határok letöltése"
 
 msgid ""
 "Validating error in file {0}:\n"
 "{1}\n"
 "Do you want to continue without validating the file ?"
 msgstr ""
+"Validációs hiba a fájlban {0}:\n"
+"{1}\n"
+"Szeretnéd folytatni, a fájl validálása nélkül?"
 
 msgid "Open Imagery XML file"
-msgstr ""
+msgstr "Légifelvétel XML fájl megnyitása"
 
 msgid "Calibration Layer"
-msgstr ""
+msgstr "Kalibrációs réteg"
 
 msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Egy érvénytelenített kalibrációs alakzat {0} ponttal, tőle: {1}"
 
 msgid "A calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Egy érvénytelenített kalibrációs alakzat {0} ponttal, tőle: {1}"
 
 msgid "Change Color"
-msgstr ""
+msgstr "Szín megváltoztatása"
 
 msgid "Deprecate Offset"
 msgstr "Eltolás érvénytelenítése"
@@ -28867,9 +29428,10 @@ msgstr "Biztos vagy benne, hogy ez a légifelvétel-eltolás nem helyes?"
 
 msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
+"Biztos vagy benne, hogy ez a kalibrációs alakzat rosszul van igazítva?"
 
 msgid "Warning: deprecation is basically irreversible!"
-msgstr ""
+msgstr "Figyelem: az érvénytelenítés alapvetően nem visszavonható!"
 
 msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
@@ -28885,9 +29447,10 @@ msgstr ""
 msgid ""
 "Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
+"Kérlek írd le, miért jelölöd ezt a kalibrációs alakzatot érvénytelennek"
 
 msgid "Notifying the server of the deprecation..."
-msgstr ""
+msgstr "Szerver értesítése az érvénytelenítésről…"
 
 msgid "Get Imagery Offset..."
 msgstr "Légifelvétel-eltolás letöltése..."
@@ -28905,7 +29468,7 @@ msgid "Loading imagery offsets..."
 msgstr "Légifelvétel-eltolás betöltése..."
 
 msgid "Error processing XML response: {0}"
-msgstr ""
+msgstr "Hiba történt az XML válasz feldolgozása közben: {0}"
 
 msgid "Offset"
 msgstr "Eltolás"
@@ -28919,14 +29482,11 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
 msgid "Calibration geometries"
-msgstr "Kalibrációs geometriák"
+msgstr "Kalibrációs alakzatok"
 
 msgid "Deprecated offsets"
 msgstr "Érvénytelenített eltolások"
@@ -28945,9 +29505,13 @@ msgid ""
 "A layer has been added with a calibration geometry. Hide data layers,\n"
 "find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
+"Egy kalibrációs alakzatot tartalmazó réteg lett hozzáadva a térképhez. "
+"Rejtsd el az adatrétegeket,\n"
+"keresd meg a megfelelő objektumot a légifelvétel rétegen és mozgasd az "
+"alakzathoz."
 
 msgid "Deprecated by {0} on {1}"
-msgstr ""
+msgstr "Érvénytelenítette {0} ekkor: {1}"
 
 msgid "Created by {0} on {1}"
 msgstr "Készítette {0} ekkor: {1}"
@@ -28959,7 +29523,7 @@ msgid "Report this offset"
 msgstr "Eltolás jelentése"
 
 msgid "You are to notify moderators of this offset. Why?"
-msgstr "A moderátorokat készült tájékoztatni erről az eltolásról. Miért?"
+msgstr "A moderátorokat készülsz tájékoztatni erről az eltolásról. Miért?"
 
 msgid "Reporting the offset..."
 msgstr "Eltolás jelentése..."
@@ -28971,25 +29535,25 @@ msgid "Imagery ID"
 msgstr "Légifelvétel azonosítója"
 
 msgid "A calibration geometry of {0} nodes"
-msgstr ""
+msgstr "Egy {0} pontból álló kalibrációs alakzat"
 
 msgid "Determined right here"
-msgstr "Pontosan itt lett rögzítve"
+msgstr "Pontosan itt lett meghatározva"
 
 msgid "Determined {0} away"
-msgstr "{0} - el odébb lett rögzítve"
+msgstr "{0}-rel odébb lett meghatározva"
 
 msgid "Reason"
-msgstr ""
+msgstr "Ok"
 
 msgid "This entry has been reported."
-msgstr ""
+msgstr "A bejegyzés jelentve lett."
 
 msgid "Server has rejected the request"
-msgstr ""
+msgstr "A szerver visszautasította a kérést"
 
 msgid "Unable to connect to the server"
-msgstr ""
+msgstr "Nem lehet kapcsolódni a szerverhez"
 
 msgid "Store Imagery Offset..."
 msgstr "Légifelvétel-eltolás feltöltése..."
@@ -29002,7 +29566,7 @@ msgstr ""
 "szerverre"
 
 msgid "Store calibration geometry"
-msgstr ""
+msgstr "Kalibrációs alakzat eltárolása"
 
 msgid "Store imagery offset"
 msgstr "Légifelvétel-eltolás feltöltése"
@@ -29011,6 +29575,8 @@ msgid ""
 "The selected object can be used as a calibration geometry. What do you "
 "intend to do?"
 msgstr ""
+"A kiválasztott objektumot kalibrációs alakzatnak lehet használni. Mit "
+"szeretnél tenni?"
 
 msgid ""
 "The topmost imagery layer has no offset. Are you sure you want to upload "
@@ -29035,18 +29601,22 @@ msgid ""
 "clearly visible boundaries on various satellite imagery. Please describe "
 "this object and its whereabouts."
 msgstr ""
+"Egy kalibrációs alakzat bejegyzésére készülsz. Ez egy tökéletesen "
+"pozicionált alakzat kell legyen,\n"
+"a műholdképen élesen látszó hatávonallal. Kérlek készíts leírást az "
+"objektumról és arról, hogy hol található."
 
 msgid "Uploading a new offset..."
 msgstr "Új eltolás feltöltése..."
 
 msgid "This string should be 3 to 200 letters long."
-msgstr ""
+msgstr "A szöveg 3 - 200 karakter hosszú kell legyen."
 
 msgid "Adjust imagery"
-msgstr ""
+msgstr "Légifelvétel igazítása"
 
 msgid "Adjust the position of the selected imagery layer"
-msgstr ""
+msgstr "A kiválasztott légifelvétel-réteg pozicionálásának igazítása"
 
 msgid "Please select the imagery layer to adjust."
 msgstr ""
@@ -29102,21 +29672,9 @@ msgstr "betöltött képek"
 msgid "Import vector graphics"
 msgstr "Vektorgrafikák betöltés"
 
-msgid "Scale:"
-msgstr "Skála:"
-
-msgid "unit(s) = "
-msgstr "mértékegység(ek): "
-
-msgid "Importing..."
-msgstr "Betöltés..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVG fájlok [ImportVec plugin] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Kérlek, nyiss vagy készíts adatréteget a betöltés előtt"
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29321,122 +29879,177 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "Check the direction"
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Correct"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Wrong"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Tracing"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "checking cache..."
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Geometria cseréje"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
+msgid "Direction index ''{0}'' not found"
+msgstr "Irány index „{0}” nem található"
+
+msgid "The starting location was not within the bbox"
+msgstr "A kezdőpozíció nem a határoló dobozon belül volt"
+
+msgid "Looking for shoreline..."
+msgstr "Partvonal keresése…"
+
+msgid "{0} nodes so far..."
+msgstr "Eddig {0} pont…"
+
+msgid "Lake Walker."
+msgstr "Lake Walker."
+
+msgid "Lake Walker"
+msgstr "Lake Walker"
+
+msgid "Error creating cache directory: {0}"
+msgstr "Hiba a gyorsítótár könyvtár létrehozásakor: {0}"
+
+msgid "Tracing"
+msgstr "Átrajzolás"
+
+msgid "checking cache..."
+msgstr "gyorsítótár ellenőrzése…"
+
+msgid "Running vertex reduction..."
+msgstr "Csúcsredukálás futtatása…"
+
+msgid "Running Douglas-Peucker approximation..."
+msgstr "Douglas-Peucker egyszerűsítés futtatása…"
+
+msgid "Removing duplicate nodes..."
+msgstr "Duplikált pontok eltávolítása…"
+
+msgid "Lakewalker trace"
+msgstr "Lakewalker átrajzolás"
+
+msgid "An unknown error has occurred"
+msgstr "Ismeretlen hiba történt"
+
 msgid "east"
 msgstr "kelet"
 
 msgid "northeast"
-msgstr ""
+msgstr "északkelet"
 
 msgid "north"
 msgstr "észak"
 
 msgid "northwest"
-msgstr ""
+msgstr "északnyugat"
 
 msgid "west"
 msgstr "nyugat"
 
 msgid "southwest"
-msgstr ""
+msgstr "délnyugat"
 
 msgid "south"
 msgstr "dél"
 
 msgid "southeast"
-msgstr ""
+msgstr "délkelet"
 
 msgid "coastline"
 msgstr "partvonal"
 
 msgid "land"
-msgstr ""
+msgstr "szárazföld"
 
 msgid "Maximum number of segments per way"
-msgstr ""
+msgstr "Szakaszok maximális száma vonalanként"
 
 msgid "Maximum number of nodes in initial trace"
-msgstr ""
+msgstr "Pontok maximális száma a kezdeti átrajzolásnál"
 
 msgid "Maximum gray value to count as water (0-255)"
-msgstr ""
+msgstr "A maximális szürkeszint, amit még víznek számít (0-255)"
 
 msgid "Line simplification accuracy (degrees)"
-msgstr ""
+msgstr "Vonalegyszerűsítés pontossága (fokban)"
 
 msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr ""
+msgstr "Landsat csempék felbontása (pixel / fok)"
 
 msgid "Size of Landsat tiles (pixels)"
-msgstr ""
+msgstr "Landsat csempék mérete (pixel)"
 
 msgid "Shift all traces to east (degrees)"
-msgstr ""
+msgstr "Összes átrajzolás eltolása keletre (fokban)"
 
 msgid "Shift all traces to north (degrees)"
-msgstr ""
+msgstr "Összes átrajzolás eltolása északra (fokban)"
 
 msgid "Direction to search for land"
-msgstr ""
+msgstr "Irány, amerre a szárazföldet keresni kell"
 
 msgid "Tag ways as"
-msgstr ""
+msgstr "Vonal címkézése mint"
 
 msgid "WMS Layer"
 msgstr "WMS Réteg"
 
 msgid "Maximum cache size (MB)"
-msgstr ""
+msgstr "Maximális gyorsítótár méret (MB)"
 
 msgid "Maximum cache age (days)"
-msgstr ""
+msgstr "Maximális gyorsítótár kor (nap)"
 
 msgid "Source text"
-msgstr ""
+msgstr "Forrás szöveg"
 
 msgid "Lakewalker Plugin Preferences"
-msgstr ""
+msgstr "Lakewalker bővítmény beállítások"
 
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "A bővítmény a vízfelületek felrajzolásához Landsat műholdképről"
@@ -29444,520 +30057,139 @@ msgstr "A bővítmény a vízfelületek felrajzolásához Landsat műholdképrő
 msgid ""
 "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
+"Egy egyes irányokban generált szakaszok maximális száma. Alapérték 250."
 
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
 "lines). Default 50000."
 msgstr ""
+"Legenerált pontok maximális száma, mielőtt feladná (vonalak egyszerűsítése "
+"előtt). Alapérték 50000."
 
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
 "in the range 0-255. Default 90."
 msgstr ""
+"A maximális szürkeszint, amit még víznek számít (Landsat IR-1 adatok "
+"alapján). 0 és 255 között lehet. Alapérték 90."
 
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in "
 "degrees.<br>Lower values give more nodes, and more accurate lines. Default "
 "0.0003."
 msgstr ""
+"A Douglas-Peucker vonal egyszerűsítés pontossága, fokban "
+"mérve.<br>Alacsonyabb érték több pontot hagy meg, és pontosabb vonalat. "
+"Alapérték 0,0003."
 
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
-msgstr ""
+msgstr "A Landsat csempék felbontása, pixel/fokban mérve. Alapérték 4000."
 
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr ""
+msgstr "Egy Landsat csempe mérete, pixelben mérve. Alapérték 2000."
 
 msgid "Offset all points in East direction (degrees). Default 0."
-msgstr ""
+msgstr "Összes pont eltolása keleti irányba (fokban). Alapérték 0."
 
 msgid "Offset all points in North direction (degrees). Default 0."
-msgstr ""
+msgstr "Összes pont eltolása északi irányba (fokban). Alapérték 0."
 
 msgid "Direction to search for land. Default east."
-msgstr ""
+msgstr "Irány, amerre a szárazföldet keresni kell. Alapérték: kelet."
 
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
+"Vonalak címkézése, mint víz, partvonal, szárazföld, vagy semmi. Alapérték: "
+"víz."
 
 msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr ""
+msgstr "Melyik WMS réteget használja az átrajzoláshoz. Alapérték: IR1."
 
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
+"Az egyes gyorsítótár-könyvtárak maximális mérete, byte-ban. Alapérték: 300MB"
 
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
+"Az egyes gyorsítótárazott fájlok maximális kora, napban. Alapérték 100"
 
 msgid "Data source text. Default is Landsat."
-msgstr ""
+msgstr "Adatforrás szöveg. Alapérték: Landsat"
 
 msgid "Downloading image tile..."
-msgstr ""
+msgstr "Képcsempe letöltése…"
 
 msgid "Could not acquire image"
-msgstr ""
+msgstr "Nem sikerült megszerezni a képet"
 
 msgid "Connection Failed"
-msgstr ""
+msgstr "Nem sikerült csatlakozni"
 
 msgid "Not connected"
-msgstr ""
+msgstr "Nincs kapcsolódva"
 
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
 msgid "Connected"
-msgstr ""
+msgstr "Kapcsolódva"
 
 msgid "no name"
 msgstr "nincs név"
 
 msgid "Live GPS"
-msgstr ""
+msgstr "Élő GPS"
 
 msgid "Show GPS data."
-msgstr ""
+msgstr "GPS-adat megjelenítése."
 
 msgid "Status"
-msgstr ""
+msgstr "Állapot"
 
 msgid "Way Info"
-msgstr ""
+msgstr "Vonal Infó"
 
 msgid "Speed"
-msgstr ""
+msgstr "Sebesség"
 
 msgid "Course"
-msgstr ""
+msgstr "Útvonal"
 
 msgid "LiveGPS layer"
-msgstr ""
+msgstr "LiveGPS réteg"
 
 msgid "Capture GPS Track"
-msgstr ""
+msgstr "GPS nyomvonal felvétele"
 
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
+"Csatlakozás gpsd szerverhez és a jelenlegi pozíció megjelenítése a LiveGPS "
+"rétegen"
 
 msgid "Center Once"
-msgstr ""
+msgstr "Középre egyszer"
 
 msgid "Center the LiveGPS layer to current position."
-msgstr ""
+msgstr "A LiveGPS réteg központosítása a jelenlegi pozícióra."
 
 msgid "Auto-Center"
-msgstr ""
+msgstr "Auto-Center"
 
 msgid "Continuously center the LiveGPS layer to current position."
-msgstr ""
+msgstr "A LiveGPS réteg folyamatos központosítása a jelenlegi pozícióra."
 
 msgid "Open MapDust"
 msgstr ""
 
 msgid "MapDust bug reports"
-msgstr ""
+msgstr "MapDust hibajelentések"
 
 msgid "Activates the MapDust bug reporter plugin"
-msgstr ""
+msgstr "Aktiválja a MapDust hibajelentés bővítményt"
 
 msgid "Missing input data"
-msgstr ""
-
-msgid "Mapillary Images"
-msgstr "Mapillary képek"
-
-msgid "Mapillary layer"
-msgstr "Mapillary réteg"
-
-msgid "Total images:"
-msgstr "Összes kép:"
-
-msgid "images"
-msgstr "képek"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Mapillary réteg készítése"
-
-msgid "Start Mapillary layer"
-msgstr "Mapillary réteg indítása"
-
-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 "Select pictures"
-msgstr "Képek kiválasztása"
-
-msgid "Import pictures into sequence"
-msgstr "Képek importálása sorozatba"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Képek importálása a Mapillary rétegre egy sorozatba"
-
-msgid "Join mode"
-msgstr "Összekapcsolási mód"
-
-msgid "Join/unjoin pictures"
-msgstr "Képek össze/szétkapcsolása"
-
-msgid "Join Mapillary pictures"
-msgstr "Mapillary képek összekapcsolása"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr "Képek feltöltése"
-
-msgid "Upload Mapillary pictures"
-msgstr "Mapillary képek feltöltése"
-
-msgid "Upload pictures."
-msgstr "Képek feltöltése."
-
-msgid "Walk mode"
-msgstr "Gyalogos mód"
-
-msgid "Start walk mode"
-msgstr "Gyalogos mód indítása"
-
-msgid "Zoom to selected image"
-msgstr "Nagyítása a kiválasztott képre"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Nagyítása a jelenleg kiválasztott Mapillary képre"
-
-msgid "Uploaded {0} images"
-msgstr "{0} kép feltöltve"
-
-msgid "Approve upload on the website"
-msgstr "Feltöltés jóváhagyása a weboldalon"
-
-msgid "View in website"
-msgstr "Megtekintés a weboldalon"
-
-msgid "Copy key"
-msgstr "Kulcs másolása"
-
-msgid "Copy key tag"
-msgstr "Kulcs címke másolása"
-
-msgid "Edit on website"
-msgstr "Szerkesztés a weboldalon"
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr "Összes kép exportálása"
-
-msgid "Export selected sequence"
-msgstr "Kiválasztott sorozat exportálása"
-
-msgid "Export selected images"
-msgstr "Kiválasztott képek exportálása"
-
-msgid "Rewrite imported images"
-msgstr "Importált képek átírása"
-
-msgid "Select a folder"
-msgstr "Könyvtár kiválasztása"
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-msgstr "Könyvtár kiválasztása"
-
-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 "Gyalogátkelő"
-
-msgid "No turn"
-msgstr "Kanyarodni 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 ablak megnyitása"
-
-msgid "Mapillary picture"
-msgstr "Mapillary kép"
-
-msgid "Open Mapillary window"
-msgstr "Mapillary ablak megnyitása"
-
-msgid "Mapillary dialog"
-msgstr "Mapillary ablak"
-
-msgid "Open Mapillary main dialog"
-msgstr "Fő Mapillary ablak megnyitása"
-
-msgid "Next picture"
-msgstr "Következő kép"
-
-msgid "Shows the next picture in the sequence"
-msgstr "A sorozat következő képére lép"
-
-msgid "Previous picture"
-msgstr "Előző kép"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "A sorozat előző képére lép"
-
-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 "Download mode"
-msgstr "Letöltési mód"
-
-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 "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 ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
+msgstr "Hiányzó input adat"
 
 msgid "Measured values"
 msgstr "Mért értékek"
@@ -29998,7 +30230,7 @@ msgid "Measurements"
 msgstr "Mérések"
 
 msgid "Merge overlap"
-msgstr ""
+msgstr "Átfedések összevonása"
 
 msgid "Merge overlap of ways."
 msgstr ""
@@ -30042,47 +30274,51 @@ msgid "Create Michigan left turn restriction"
 msgstr ""
 
 msgid "Unable to find via nodes. Please check your selection"
-msgstr ""
+msgstr "Nem találhatók „via” pontok. Ellenőrizd a kijelölést"
 
 msgid "About Plugin"
-msgstr ""
+msgstr "A bővítményről"
 
 msgid "Native password manager plugin"
-msgstr ""
+msgstr "Natív jelzőkezelő bővítmény"
 
 msgid "No native password manager could be found!"
-msgstr ""
+msgstr "Nem található natív jelszókezelő!"
 
 msgid ""
 "Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
+"Az operációs rendszeredtől, disztribúciódtól függően előbb létre kell(het) "
+"hoznod egy alapértelmezett kulcstartót, pénztárcát."
 
 msgid "No thanks, use JOSM''s plain text preferences storage"
-msgstr ""
+msgstr "Kösz nem, használom a JOSM beépített egyszerű szöveg tárolóját"
 
 msgid ""
 "Found sensitive data that is still saved in JOSM''s preference file (plain "
 "text)."
 msgstr ""
+"Érzékeny adatot találtam, ami még a JOSM beállítás fájljába van mentve "
+"(egyszerű szöveg)."
 
 msgid "Transfer to password manager and remove from preference file"
-msgstr ""
+msgstr "Áthelyezés a jelszókezelőbe és törlés a beállítás fájlból"
 
 msgid "No, just keep it"
-msgstr ""
+msgstr "Nem, csak tartsd meg"
 
 msgid "Close the dialog and discard all changes"
-msgstr ""
+msgstr "Dialógusablak bezárása és az összes változtatás elvetése"
 
 msgid "Proceed and go to the next page"
-msgstr ""
+msgstr "Folytatás, tovább a következő oldalra"
 
 msgid "Finish"
 msgstr "Befejezés"
 
 msgid "Confirm the setup and close this dialog"
-msgstr ""
+msgstr "Beállítások megerősítése és a dialógusablak bezárása"
 
 msgid "JOSM/OSM API/Username"
 msgstr "JOSM/OSM API/Felhasználónév"
@@ -30162,24 +30398,26 @@ msgid ""
 "(To miserably continue mapping, edit out no_more_mapping\n"
 "from {0})"
 msgstr ""
+"(Ha szánalmas módon mégis folytatnád a térképezést, töröld a no_more_mapping "
+"beállítást innen: {0})"
 
 msgid "OSM Server Files o5m compressed"
-msgstr ""
+msgstr "o5m OSM szerver fájlok"
 
 msgid "Invalid changeset id: {0}"
-msgstr ""
+msgstr "Érvénytelen módosításcsomag azonosító: {0}"
 
 msgid "Invalid timestamp: {0}"
-msgstr ""
+msgstr "Érvénytelen időbélyeg: {0}"
 
 msgid "wrong header byte "
-msgstr ""
+msgstr "hibás fejléc bájt "
 
 msgid "unsupported header"
-msgstr ""
+msgstr "nem támogatott fejléc"
 
 msgid "Reading OSM data..."
-msgstr ""
+msgstr "OSM-adatok olvasása…"
 
 msgid "Split by municipality"
 msgstr ""
@@ -30200,32 +30438,31 @@ msgid "Split this data by neighbourhood (admin_level=11)."
 msgstr ""
 
 msgid "Download open data"
-msgstr "Nyílt adatok letöltése"
+msgstr "Nyílt adat letöltése"
 
 msgid "License URL not available: {0}"
-msgstr "A licensz URL nem elérhető: {0}"
+msgstr "A licenc URL nem elérhető: {0}"
 
 msgid "OpenData preferences"
 msgstr "OpenData beállítások"
 
 msgid "License Agreement"
-msgstr "Licensz megállapodás"
+msgstr "Licencszerződés"
 
 msgid "Accept"
-msgstr "Elfogad"
+msgstr "Elfogadás"
 
 msgid "Refuse"
-msgstr "Elutasít"
+msgstr "Elutasítás"
 
 msgid "I understand and accept these terms and conditions"
-msgstr "Értem és elfogadom ezeket a feltételeket és körülményeket"
+msgstr "Értem és elfogadom a felhasználási feltételeket"
 
 msgid "View the full text of this license"
-msgstr "A licensz teljes szövegének megjelenítése"
+msgstr "A licenc teljes szövegének megjelenítése"
 
 msgid "I refuse these terms and conditions. Cancel download."
-msgstr ""
-"Elutasítom ezeket a feltételeket és körülményeket. Letöltés megszakítása."
+msgstr "Elutasítom a felhasználási feltételeket. Letöltés megszakítása."
 
 msgid "Module bundled with opendata plugin"
 msgstr "A modul az OpenData bővítménnyel van összecsomagolva"
@@ -30247,8 +30484,8 @@ msgstr[1] "Az alábbi {0} modul <strong>sikeresen</strong> letöltve:"
 msgid "Downloading the following module has <strong>failed</strong>:"
 msgid_plural ""
 "Downloading the following {0} modules has <strong>failed</strong>:"
-msgstr[0] "A következő modul letöltése <strong>meghiúsult</strong>:"
-msgstr[1] "A következő {0} modul letöltése <strong>meghiúsult</strong>:"
+msgstr[0] "Az alábbi modul letöltése <strong>meghiúsult</strong>:"
+msgstr[1] "Az alábbi {0} modul letöltése <strong>meghiúsult</strong>:"
 
 msgid "Modules"
 msgstr "Modulok"
@@ -30257,7 +30494,7 @@ msgid "Accept the new module sites and close the dialog"
 msgstr "Az új modul oldalak elfogadása és a dialógus bezárása"
 
 msgid "Configure Module Sites"
-msgstr "Modul Oldalak konfigurálása"
+msgstr "Modul oldalak konfigurálása"
 
 msgid "Download the list of available modules"
 msgstr "Az elérhető modulok listájának letöltése"
@@ -30269,47 +30506,49 @@ msgid "Update the selected modules"
 msgstr "A kiválasztott modulok frissítése"
 
 msgid "Please restart JOSM to activate the downloaded modules."
-msgstr "Kérlek, indítsd újra a JOSM-ot a letöltött modulok aktiválásához."
+msgstr "Kérlek, indítsd újra a JOSM-et a letöltött modulok aktiválásához."
 
 msgid ""
 "All installed modules are up to date. JOSM does not have to download newer "
 "versions."
 msgstr ""
-"Minden telepített modul naprakész. A JOSM-nak nem kell újabb verziókat "
+"Minden telepített modul naprakész. A JOSM-nek nem kell újabb verziókat "
 "letöltenie."
 
 msgid "Modules up to date"
 msgstr "A modulok naprakészek"
 
 msgid "Configure the list of sites where modules are downloaded from"
-msgstr ""
+msgstr "A modulok letöltéséhez használt webhelyek listájának szerkesztése"
 
 msgid "Add Open Data Module description URL."
-msgstr ""
+msgstr "Open Data modul URL hozzáadása."
 
 msgid "Edit Open Data Module description URL."
-msgstr ""
+msgstr "Open Data modul URL szerkesztése."
 
 msgid "Open Data Module description URL"
-msgstr ""
+msgstr "Open Data modul URL"
 
 msgid "Download OSM data corresponding to the current data set."
-msgstr ""
+msgstr "OSM-adatok letöltése a jelenlegi adathalmaznak megfelelően."
 
 msgid "Diff"
 msgstr "Különbség"
 
 msgid "Perform diff between current data set and existing OSM data."
 msgstr ""
+"Diff (összehasonlítás) készítése a jelenlegi adathalmaz és a meglévő OSM "
+"adatok között."
 
 msgid "Tools"
 msgstr "Eszközök"
 
 msgid "Open tools menu for this data."
-msgstr ""
+msgstr "Eszközök menü megnyitása ehhez az adathoz"
 
 msgid "Open the OpenData window."
-msgstr ""
+msgstr "OpenData ablak megnyitása"
 
 msgid "Raw data"
 msgstr "Nyers adat"
@@ -30322,6 +30561,9 @@ msgid ""
 "Terms and Conditions of Use of each portal<br/>before any upload of data "
 "loaded by this plugin."
 msgstr ""
+"A különböző Open Data portálok speciális kezelője<br/><br/>Kérlek olvasd el "
+"az egyes portálok felhasználási feltételeit<br/>mielőtt a bővítménnyel "
+"bármilyen adatot feltöltenél."
 
 msgid "General settings"
 msgstr "Általános beállítások"
@@ -30330,12 +30572,14 @@ msgid ""
 "Import only raw data (i.e. do not add/delete tags or replace them by "
 "standard OSM tags)"
 msgstr ""
+"Csak nyers adatok importálása (pl. nem ad hozz, nem töröl címkéket és nem "
+"cseréli szabványos OSM címkékre)"
 
 msgid "Overpass API server:"
 msgstr "Overpass API szerver:"
 
 msgid "Overpass API server used to download OSM data"
-msgstr ""
+msgstr "OSM adatok letöltésére használandó Overpass API szerver"
 
 msgid "XAPI server:"
 msgstr "XAPI szerver:"
@@ -30389,9 +30633,13 @@ msgid ""
 "perform a non-precise transformation (<b>with location errors up to 1 "
 "km</b>) ?<br/><br/>If so, <b>do NOT upload</b> such data to OSM !"
 msgstr ""
+"A JOSM nem talált pontos matematikai transzformációt „{0}” és WGS84 "
+"között.<br /><br />Szeretnél kipróbálni egy <i>elnéző</i> módszert, ami "
+"pontatlan transzformációt végez (<b>akár 1 km-es hibával</b>) ?<br/><br/>Ha "
+"igen, <b>NE töltsd fel</b> az adatokat OSM-re !"
 
 msgid "Try lenient method"
-msgstr ""
+msgstr "Elnéző módszer kipróbálása"
 
 msgid "GML files"
 msgstr "GML fájlok"
@@ -30403,24 +30651,26 @@ msgid "MapInfo files"
 msgstr "MapInfo fájlok"
 
 msgid "Shapefiles"
-msgstr ""
+msgstr "Shapefájlok"
 
 msgid ""
 "Unable to detect Coordinate Reference System.\n"
 "Would you like to fallback to ESPG:4326 (WGS 84) ?"
 msgstr ""
+"Nem sikerült felismerni a Koordináta Azonosító Rendszert (CRS).\n"
+"Szeretnél átállni az alapértelmezett ESPG:4326-ra (WGS 84)?"
 
 msgid "Warning: CRS not found"
-msgstr ""
+msgstr "Figyelem: CRS nem található"
 
 msgid "Unable to detect CRS !"
-msgstr ""
+msgstr "CRS nem ismerhető fel!"
 
 msgid "Unable to find a data store for file {0}"
-msgstr ""
+msgstr "Nem található adattároló ehhez a fájlhoz: {0}"
 
 msgid "Loading shapefile ({0} features)"
-msgstr ""
+msgstr "Shapefájl betöltése ({0} elem)"
 
 msgid "CSV files"
 msgstr "CSV fájlok"
@@ -30429,258 +30679,288 @@ msgid "ODS files"
 msgstr "ODS fájlok"
 
 msgid "No valid coordinates have been found."
-msgstr ""
+msgstr "Nem találtam érvényes koordinátát."
 
 msgid "Invalid file. Bad length on line {0}. Expected {1} columns, got {2}."
 msgstr ""
+"Érvénytelen fájl. Hibás hossz a(z) {0}. sorban. Várt {1} oszlop, kapott {2}."
 
 msgid "XLS files"
 msgstr "XLS fájlok"
 
 msgid "View OSM Wiki page"
-msgstr ""
+msgstr "OSM Wikioldal megtekintése"
 
 msgid "Launch browser to the OSM Wiki page of the selected data set"
-msgstr ""
+msgstr "Böngésző indítása a kiválasztott adathalmaz OSM Wikioldalával"
 
 msgid "View Local Portal page"
-msgstr ""
+msgstr "Helyi Portál oldal megtekintése"
 
 msgid "Launch browser to the local portal page of the selected data set"
-msgstr ""
+msgstr "Böngésző indítása a kiválasztott adathalmaz helyi portál oldalával"
 
 msgid "View National Portal page"
-msgstr ""
+msgstr "Nemzeti Portál oldal megtekintése"
 
 msgid "Launch browser to the national portal page of the selected data set"
-msgstr ""
+msgstr "Böngésző indítása a kiválasztott adathalmaz nemzeti portál oldalával"
 
 msgid "View License"
-msgstr ""
+msgstr "Licenc megtekintése"
 
 msgid "Launch browser to the license page of the selected data set"
 msgstr ""
+"Böngésző indítása a kiválasztott adathalmaz licencnyilatkozati oldalával"
 
 msgid "View License (summary)"
-msgstr ""
+msgstr "Licenc megtekintése (összefoglaló)"
 
 msgid "Launch browser to the summary license page of the selected data set"
 msgstr ""
+"Böngésző indítása a kiválasztott adathalmaz licencnyilatkozati összefoglaló "
+"oldalával"
 
 msgid "View the license of the selected data set"
-msgstr ""
+msgstr "A jelenleg kiválasztott adathalmaz licencének megtekintése."
 
 msgid ""
 "Warning: Cannot download module ''{0}''. Its download link is not known. "
 "Skipping download."
 msgstr ""
+"Figyelmeztetés: „{0}” modult nem lehet letölteni. A letöltési linkje "
+"ismeretlen. Letöltés kihagyása."
 
 msgid ""
 "Warning: Cannot download module ''{0}''. Its download link ''{1}'' is not a "
 "valid URL. Skipping download."
 msgstr ""
+"Figyelmeztetés: „{0}” modult nem lehet letölteni. „{1}” letöltési link egy "
+"érvénytelen URL. Letöltés kihagyása."
 
 msgid "Downloading Module {0}..."
-msgstr ""
+msgstr "{0} modul letöltése…"
 
 msgid "An error occurred in module {0}"
-msgstr ""
+msgstr "{0} modulban hiba történt"
 
 msgid "Last module update more than {0} days ago."
-msgstr ""
+msgstr "Utolsó modulfrissítés több, mint {0} nappal ezelőtt."
 
 msgid "Click to update the activated modules"
-msgstr ""
+msgstr "Kattints az aktív modulok frissítéséhez"
 
 msgid "Click to skip updating the activated modules"
-msgstr ""
+msgstr "Kattints az aktív modulok frissítésének kihagyásához"
 
 msgid ""
 "Skipping module update after elapsed update interval. Automatic update at "
 "startup is disabled."
 msgstr ""
+"Modulfrissítés kihagyása az eltelt frissítési időköz után. Az automatikus "
+"frissítés le van tiltva."
 
 msgid ""
 "Running module update after elapsed update interval. Automatic update at "
 "startup is disabled."
 msgstr ""
+"Modulfrissítés az eltelt frissítési időköz után. Az automatikus frissítés le "
+"van tiltva."
 
 msgid "Could not load module {0}. Delete from preferences?"
-msgstr ""
+msgstr "{0} modul nem tölthető be. Törlöd a beállításokból?"
 
 msgid "loading module ''{0}'' (version {1})"
-msgstr ""
+msgstr "„{0}” modul betöltése (verzió {1})"
 
 msgid ""
 "<html>Could not load module {0} because the module<br>main class ''{1}'' was "
 "not found.<br>Delete from preferences?</html>"
 msgstr ""
+"<html>{0} modult nem lehetett betölteni, mert<br/>a fő osztálya „{1}” nem "
+"található.<br/>Törlöd a beállításokból?</html>"
 
 msgid "Loading modules ..."
-msgstr ""
+msgstr "Modulok betöltése…"
 
 msgid "Checking module preconditions..."
-msgstr ""
+msgstr "Modul előfeltételeinek ellenőrzése…"
 
 msgid "Loading module ''{0}''..."
-msgstr ""
+msgstr "„{0}” modul betöltése…"
 
 msgid "JOSM could not find information about the following module:"
 msgid_plural "JOSM could not find information about the following modules:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A JOSM nem talál adatokat az alábbi modulról:"
+msgstr[1] "A JOSM nem talál adatokat az alábbi modulokról:"
 
 msgid "The module is not going to be loaded."
 msgid_plural "The modules are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A modul nem lesz betöltve."
+msgstr[1] "A modulok nem lesznek betöltve."
 
 msgid "Updating the following module has failed:"
 msgid_plural "Updating the following modules has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Az alábbi modul frissítése nem sikerült:"
+msgstr[1] "Az alábbi modulok frissítése nem sikerült:"
 
 msgid "Module update failed"
-msgstr ""
+msgstr "Modulfrissítés sikertelen"
 
 msgid "Warning: failed to download module information list"
-msgstr ""
+msgstr "Figyelmeztetés: nem sikerült letölteni a modulinformációs listát"
 
 msgid "Disable module"
-msgstr ""
+msgstr "Modul letiltása"
 
 msgid "Click to delete the module ''{0}''"
-msgstr ""
+msgstr "„{0}” modul letiltásához kattints ide"
 
 msgid "Keep module"
-msgstr ""
+msgstr "Modul megtartása"
 
 msgid "Click to keep the module ''{0}''"
-msgstr ""
+msgstr "„{0}” modul megtartásához kattints ide"
 
 msgid "Warning: failed to delete outdated module ''{0}''."
-msgstr ""
+msgstr "Figyelmeztetés: nem sikerült törölni ezt az elavult modult: „{0}”"
 
 msgid ""
 "Warning: failed to install already downloaded module ''{0}''. Skipping "
 "installation. JOSM is still going to load the old module version."
 msgstr ""
+"Figyelmeztetés: nem sikerült telepíteni a már letöltött „{0}” modult. "
+"Telepítés kihagyása. A JOSM továbbra is a modul régi verzióját fogja "
+"betölteni."
 
 msgid ""
 "Warning: failed to install module ''{0}'' from temporary download file "
 "''{1}''. Renaming failed."
 msgstr ""
+"Figyelmeztetés: nem sikerült telepíteni a(z) „{0}” modult ebből az "
+"ideiglenesen letöltött fájlból: „{1}”. Átnevezés sikertelen."
 
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Modules to "
 "change it later)"
 msgstr ""
+"Ne kérdezze meg újra, emlékezzen a választásomra (megváltoztathatod a "
+"Beállítások -> Modulok alatt)"
 
 msgid "The module file ''{0}'' does not include a Manifest."
-msgstr ""
+msgstr "„{0}” modulfájl nem tartalmaz Manifest metaadatokat."
 
 msgid "Invalid URL ''{0}'' in module {1}"
-msgstr ""
+msgstr "Érvénytelen URL „{0}” {1} modulban"
 
 msgid "<b>Module provided by an external source:</b> {0}"
 msgstr "<b>Külső forrásból szolgáltatott modul:</b> {0}"
 
 msgid "Failed to create module information from manifest for module ''{0}''"
 msgstr ""
+"Nem sikerült elkészíteni a modulinformációkat „{0}” modul manifest fájljából"
 
 msgid "Illegal entry in module list."
-msgstr ""
+msgstr "Érvénytelen bejegyzés a modul listában."
 
 msgid "Reading local module information.."
-msgstr ""
+msgstr "Helyi modulinformációk olvasása…"
 
 msgid "Processing module site cache files..."
-msgstr ""
+msgstr "Modul webhely gyorsítótár fájl feldolgozása…"
 
 msgid ""
 "Warning: Failed to scan file ''{0}'' for module information. Skipping."
 msgstr ""
+"Figyelmeztetés: Nem sikerült beolvasni „{0}” fájl a modulinformációkért. "
+"Kihagyás."
 
 msgid "Processing module site cache icon files..."
-msgstr ""
+msgstr "Modul webhely gyorsítótár ikon fájl feldolgozása…"
 
 msgid "Processing module files..."
-msgstr ""
+msgstr "Modul fájlok feldolgozása…"
 
 msgid "Download module list..."
 msgstr "Modul lista letöltése..."
 
 msgid "Downloading module list from ''{0}''"
-msgstr ""
+msgstr "Modul lista letöltése innen: „{0}”"
 
 msgid ""
 "Warning: failed to create module directory ''{0}''. Cannot cache module list "
 "from module site ''{1}''."
 msgstr ""
+"Figyelmeztetés: nem sikerült létrehozni a modul könyvtárat: „{0}”. A modul "
+"lista nem gyorsítótárazható a modul webhelyről: „{1}”."
 
 msgid "Writing module list to local cache ''{0}''"
-msgstr ""
+msgstr "Modul lista írása a helyi gyorsítótárba: „{0}”"
 
 msgid "Parsing module list from site ''{0}''"
-msgstr ""
+msgstr "Modullista elemzése „{0}” webhelyről"
 
 msgid ""
 "Failed to parse module list document from site ''{0}''. Skipping site. "
 "Exception was: {1}"
 msgstr ""
+"Nem sikerült elemezni a(z) „{0}” webhelyről származó modullistát. Webhely "
+"kihagyása. Kivétel: {1}"
 
 msgid "Processing module list from site ''{0}''"
-msgstr ""
+msgstr "Modullista feldolgozása „{0}” webhelyről"
 
 msgid "Open Visible..."
-msgstr ""
+msgstr "Látható megnyitása…"
 
 msgid "Open only files that are visible in current view."
-msgstr ""
+msgstr "Csak azon fájlok megnyitása, amik láthatóak az aktuális nézeten."
 
 msgid "No view open - cannot determine boundaries!"
-msgstr ""
+msgstr "Nincs megnyitott nézet – a határok nem határozhatóak meg!"
 
 msgid "Unknown file extension: {0}"
-msgstr ""
+msgstr "Ismeretlen fájlkiterjesztés: {0}"
 
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "„{0}” fájl elemzése sikertelen"
 
 msgid "Osmarender"
-msgstr ""
+msgstr "Osmarender"
 
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
 "the preferences."
 msgstr ""
+"Firefox nem található. Kérlek állítsd be a Firefox elérési útját a "
+"térképbeállításokban."
 
 msgid "Firefox executable"
 msgstr "FireFox futtatható állomány"
 
 msgid "OSM Server Files pbf compressed"
-msgstr ""
+msgstr "OSM szerver fájl pbf tömörített"
 
 msgid "Download PBF"
 msgstr "PBF letöltése"
 
 msgid "Invalid DenseNodes key/values table"
-msgstr ""
+msgstr "Érvénytelen DenseNodes kulcs/érték tábla"
 
 msgid "Transform error: Min X must be smaller than max"
-msgstr ""
+msgstr "Transzformációs hiba: min X kisebb kell legyen maxnál"
 
 msgid "Transform error: Min Y must be smaller than max"
-msgstr ""
+msgstr "Transzformációs hiba: min Y kisebb kell legyen maxnál"
 
 msgid "Transform error: Points too close"
-msgstr ""
+msgstr "Transzformációs hiba: pontok túl közel"
 
 msgid "Transform error: Unsupported variant."
-msgstr ""
+msgstr "Transzformációs hiba: nem támogatott változó"
 
 msgid "Transform error: Unsupported orientation"
-msgstr ""
+msgstr "Transzformációs hiba: nem támogatott orientáció"
 
 msgid "Finished"
 msgstr "Befejezett"
@@ -30906,288 +31186,294 @@ msgid "Photo Geotagging Plugin"
 msgstr "Fotó Geotagging bővítmény"
 
 msgid "Writing position information to image files..."
-msgstr ""
+msgstr "Pozíció írása a képekbe…"
 
 msgid "Could not read mtime."
-msgstr ""
+msgstr "mtime nem olvasható."
 
 msgid "Could not write mtime."
-msgstr ""
+msgstr "mtime nem írható."
 
 msgid "File could not be deleted!"
-msgstr ""
+msgstr "A fájlt nem lehetett törölni!"
 
 msgid "Could not rename file!"
 msgstr "Nem lehet átnevezni a fájlt!"
 
 msgid "Could not rename file {0} to {1}!"
-msgstr ""
+msgstr "{0} fájl nem nevezhető át erre: {1}!"
 
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
+"<html><h3>Régi biztonsági mentések találhatók a kép könyvtárában!</h3>"
 
 msgid "Override old backup files?"
 msgstr "Régi biztonsági másolat fájlok felülírása?"
 
 msgid "Keep old backups and continue"
-msgstr ""
+msgstr "Régi mentések megtartása és folytatás"
 
 msgid "Override"
-msgstr ""
+msgstr "Felülírás"
 
 msgid "Could not delete temporary file!"
-msgstr ""
+msgstr "Az ideiglenes fájlt nem lehet törölni!"
 
 msgid "Test failed: Could not read mtime."
-msgstr ""
+msgstr "Teszt sikertelen: mtime nem olvasható"
 
 msgid "Test failed: Could not write mtime."
-msgstr ""
+msgstr "Teszt sikertelen: mtime nem írható"
 
 msgid "Adjust photos"
-msgstr ""
+msgstr "Fotók igazítása"
 
 msgid "Move and position photos"
-msgstr ""
+msgstr "Fotók mozgatása és pozicionálása"
 
 msgid ""
 "Click+drag photo, shift+click to position photo, control+click to set "
 "direction."
 msgstr ""
+"Klikk+húzd a fotót; shift+klikkel elhelyezheted a fotót; ctrl+klikkel irány "
+"beállítás."
 
 msgid "Please load some photos."
-msgstr ""
+msgstr "Kérlek tölts be fényképeket."
 
 msgid "Edit photo GPS data"
-msgstr ""
+msgstr "Fénykép GPS-adatok szerkesztése"
 
 msgid "Edit GPS data of selected photo."
-msgstr ""
+msgstr "A kiválasztott fotó GPS-adatainak szerkesztése"
 
 msgid "Edit Photo GPS Data"
-msgstr ""
+msgstr "Fénykép GPS-adatok szerkesztése"
 
 msgid "Please select an image first."
-msgstr ""
+msgstr "Előbb válassz ki egy képet."
 
 msgid "No image selected"
-msgstr ""
+msgstr "Nincs kép kiválasztva"
 
 msgid "(Empty values delete the according fields.)"
-msgstr ""
+msgstr "(Üres érték törli a mezőt.)"
 
 msgid "coordinates"
 msgstr "koordináták"
 
 msgid "Latitude and longitude"
-msgstr ""
+msgstr "Szélesség és hosszúság"
 
 msgid "Edit Image Coordinates"
-msgstr ""
+msgstr "Kép koordinátáinak szerkesztése"
 
 msgid "Edit coordinates in separate editor"
-msgstr ""
+msgstr "Koordináták szerkesztése külön szerkesztőben"
 
 msgid "altitude"
-msgstr ""
+msgstr "magasság"
 
 msgid "Altitude:"
-msgstr ""
+msgstr "Magasság:"
 
 msgid "speed"
-msgstr ""
+msgstr "sebesség"
 
 msgid "positive number or empty"
-msgstr ""
+msgstr "pozitív szám, vagy üres"
 
 msgid "Speed:"
-msgstr ""
+msgstr "Sebesség:"
 
 msgid "direction"
-msgstr ""
+msgstr "irány"
 
 msgid "range -360.0 .. 360.0, or empty"
-msgstr ""
+msgstr "-360.0 és 360.0 között, vagy üres"
 
 msgid "Direction:"
-msgstr ""
+msgstr "Irány:"
 
 msgid "°"
-msgstr ""
+msgstr "°"
 
 msgid "Undo changes made in this dialog"
-msgstr ""
+msgstr "A dialógusablakban végzett módosítások visszavonása"
 
 msgid "Reload GPS data from image file"
-msgstr ""
+msgstr "GPS-adatok újratöltése a képfájlból"
 
 msgid "New layer for untagged images"
-msgstr ""
+msgstr "Új réteg a geotageletlen képeknek"
 
 msgid "Untagged Images"
-msgstr ""
+msgstr "Geotageletlen képek"
 
 msgid "Do you want to save current calibration of layer {0}?"
-msgstr ""
+msgstr "Szeretnéd elmenteni a(z) {0} réteg jelenlegi kalibrációját?"
 
 msgid "Select an option"
-msgstr ""
+msgstr "Válassz egy lehetőséget"
 
 msgid "Load Picture Calibration..."
 msgstr "Kép kalibráció betöltése..."
 
 msgid "Loads calibration data from a file"
-msgstr ""
+msgstr "Kalibrációs adat betöltése fájlból"
 
 msgid "Loading file failed: {0}"
-msgstr ""
+msgstr "Fájl betöltése sikertelen: {0}"
 
 msgid "Problem occurred"
-msgstr ""
+msgstr "Hiba történt"
 
 msgid "Load World File Calibration..."
-msgstr ""
+msgstr "World File Calibration betöltése..."
 
 msgid "Loads calibration data from a world file"
-msgstr ""
+msgstr "Kalibrációs adat betöltése world fájlból"
 
 msgid "Reset Calibration"
-msgstr ""
+msgstr "Kalibráció visszaállítása"
 
 msgid "Reset calibration"
-msgstr ""
+msgstr "Kalibráció visszaállítása"
 
 msgid "Calibration reset"
-msgstr ""
+msgstr "Kalibráció visszaállítása"
 
 msgid "Save Picture Calibration..."
-msgstr ""
+msgstr "Képkalibráció mentése…"
 
 msgid "Saves calibration data to a file"
-msgstr ""
+msgstr "A kalibrációs adatot fájlba menti"
 
 msgid "Saving file failed: {0}"
-msgstr ""
+msgstr "Fájl mentése sikertelen: {0}"
 
 msgid "New picture layer from clipboard"
-msgstr ""
+msgstr "Új kép réteg vágólapról…"
 
 msgid "Supported image files, *.zip, *.kml"
 msgstr "Támogatott kép fájlok, *.zip, *.kml"
 
 msgid "New picture layer from file..."
-msgstr ""
+msgstr "Új kép réteg fájlból…"
 
 msgid ""
 "KML calibration is in beta stage and may produce incorrectly calibrated "
 "layers!\n"
 "Please use {0} to upload your KMLs that were calibrated incorrectly."
 msgstr ""
+"A KML kalibráció jelenleg béta állapotú és hibásan kalibrált képeket "
+"eredményezhet!\n"
+"A hibásan kalibrált KML-t kérlek töltsd fel ide: {0}"
 
 msgid "Notification"
-msgstr ""
+msgstr "Értesítés"
 
 msgid "PicLayer move"
-msgstr ""
+msgstr "PicLayer mozgatás"
 
 msgid "Moved"
 msgstr "Mozgatott"
 
 msgid "Drag to move the picture"
-msgstr ""
+msgstr "Mozgatáshoz húzd a képet"
 
 msgid "PicLayer rotate"
-msgstr ""
+msgstr "PicLayer forgatás"
 
 msgid "Rotated"
-msgstr ""
+msgstr "Elforgatott"
 
 msgid "Drag to rotate the picture"
-msgstr ""
+msgstr "Forgatáshoz húzd a képet"
 
 msgid "PicLayer scale X"
-msgstr ""
+msgstr "PicLayer X-tengely nyújtás"
 
 msgid "Scaled by X"
-msgstr ""
+msgstr "Nyújtva X-tengely mentén"
 
 msgid "Drag to scale the picture in the X Axis"
-msgstr ""
+msgstr "Húzd a képet az X-tengely menti nyújtáshoz"
 
 msgid "PicLayer scale"
-msgstr ""
+msgstr "PicLayer nyújtás"
 
 msgid "Scaled"
-msgstr ""
+msgstr "Nyújtva"
 
 msgid "Drag to scale the picture in the X and Y Axis"
-msgstr ""
+msgstr "Húzd a képet az X- és Y-tengely menti nyújtáshoz"
 
 msgid "PicLayer scale Y"
-msgstr ""
+msgstr "PicLayer Y-tengely nyújtás"
 
 msgid "Scaled by Y"
-msgstr ""
+msgstr "Nyújtva Y-tengely mentén"
 
 msgid "Drag to scale the picture in the Y Axis"
-msgstr ""
+msgstr "Húzd a képet az Y-tengely menti nyújtáshoz"
 
 msgid "PicLayer shear"
-msgstr ""
+msgstr "PicLayer döntés"
 
 msgid "Sheared"
-msgstr ""
+msgstr "Döntve"
 
 msgid "Drag to shear the picture"
-msgstr ""
+msgstr "Döntéshez húzd a képet"
 
 msgid "PicLayer Move point"
-msgstr ""
+msgstr "PicLayer pont mozgatása"
 
 msgid "Point added/moved"
-msgstr ""
+msgstr "Pont hozzáadva/mozgatva"
 
 msgid "Drag or create point on the picture"
-msgstr ""
+msgstr "Húzd, vagy hozz létre pontot a képen"
 
 msgid "PicLayer Remove point"
-msgstr ""
+msgstr "PicLayer pont eltávolítása"
 
 msgid "Point removed"
-msgstr ""
+msgstr "Pont eltávolítva"
 
 msgid "Remove point on the picture"
-msgstr ""
+msgstr "Pont eltávolítása a képről"
 
 msgid "PicLayer Transform point"
-msgstr ""
+msgstr "PicLayer pont transzformálása"
 
 msgid "Point transformed"
-msgstr ""
+msgstr "Pont transzformálva"
 
 msgid "Transform point on the picture"
-msgstr ""
+msgstr "Pont transzformálása a képen"
 
 msgid "PicLayer: {0}"
-msgstr ""
+msgstr "PicLayer: {0}"
 
 msgid "Calibration Files"
 msgstr "Kalibrációs Fájlok"
 
 msgid "Could not find the map object."
-msgstr ""
+msgstr "A térkép objektum nem található."
 
 msgid "PicLayer failed to load or import the image."
-msgstr ""
+msgstr "A PicLayer nem tudta betölteni, vagy importálni a képet."
 
 msgid "Nothing in clipboard"
-msgstr ""
+msgstr "Nincs semmi a vágólapon"
 
 msgid "The clipboard data is not an image"
-msgstr ""
+msgstr "A vágólapon nem kép van"
 
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "Figyelem: „{0}” zip fájl nem kezelhető. Kivétel: {1}"
 
 msgid "A calibration file associated to the picture file was found: {0}\n"
 msgstr "A képfájlhoz kalibrációs fájl tartozik: {0}\n"
@@ -31214,25 +31500,25 @@ msgstr ""
 "Mostantól a kalibrációs fájlok mindig automatikusan fognak betöltődni."
 
 msgid "Point info"
-msgstr ""
+msgstr "Pont infó"
 
 msgid "Point info."
-msgstr ""
+msgstr "Pont infó."
 
 msgid "Connecting server"
-msgstr ""
+msgstr "Csatlakozás a kiszolgálóhoz"
 
 msgid "PointInfo"
-msgstr ""
+msgstr "PointInfo"
 
 msgid "Data not available."
-msgstr ""
+msgstr "Adat nem érhető el."
 
 msgid "Add new address point"
 msgstr "Új lakcím pont hozzáadása"
 
 msgid "Tags copied to clipboard."
-msgstr ""
+msgstr "A címkék vágólapra lettek másolva"
 
 msgid "New address point added."
 msgstr "Új lakcím pont hozzáadva."
@@ -31241,31 +31527,31 @@ msgid "Download Osmosis poly"
 msgstr "Osmosis poligon letöltése"
 
 msgid "Reading polygon filter file..."
-msgstr ""
+msgstr "Poligon szűrőfájl olvasása…"
 
 msgid "Error reading poly file: {0}"
-msgstr ""
+msgstr "Hiba a polygon fájl olvasásakor: {0}"
 
 msgid "The file must begin with a polygon name"
-msgstr ""
+msgstr "A fájl egy poligon névvel kell kezdődjön"
 
 msgid "There are less than 2 points in an area"
-msgstr ""
+msgstr "Kevesebb, mint 2 pont van egy területben"
 
 msgid "A polygon coordinate line must contain exactly 2 numbers"
-msgstr ""
+msgstr "Egy poligon koordináta sor pontosan 2 számot kell tartalmazzon"
 
 msgid "Unable to parse {0} as a number"
-msgstr ""
+msgstr "„{0}” nem értelmezhető számként"
 
 msgid "Invalid coordinates were found: {0}, {1}"
-msgstr ""
+msgstr "Érvénytelen koordináták: {0}, {1}"
 
 msgid "{0} points were outside world bounds and were moved"
-msgstr ""
+msgstr "{0} pont a világon kívülre esett, ezért el lett távolítva"
 
 msgid "Osmosis polygon filter files"
-msgstr ""
+msgstr "Osmosis poligon szűrőfájlok"
 
 msgid "Print..."
 msgstr "Nyomtatás..."
@@ -31319,16 +31605,17 @@ msgid "Printing has failed."
 msgstr "A nyomtatás meghiúsult."
 
 msgid "Add stop position"
-msgstr ""
+msgstr "Megállóhely hozzáadása"
 
 msgid "Repeat last fix"
-msgstr ""
+msgstr "Előző javítás ismétlése"
 
 msgid "Do you want to download referrers of platforms and stop positions?"
-msgstr ""
+msgstr "Szeretnéd letölteni a platformok és megállóhelyek azonosítóit?"
 
 msgid "Remember my choice and do not ask me again in this session"
 msgstr ""
+"Emlékezzen a választásomra és ne kérdezze meg újra a munkamenet során"
 
 msgid "PT_Assistant Fetch Request"
 msgstr ""
@@ -31338,92 +31625,102 @@ msgid ""
 "They need to be downloaded to proceed with validation.\n"
 "Do you want to download them?"
 msgstr ""
+"Az útvonalkapcsolatok félkész tagokat tartalmaznak.\n"
+"A validáció folytatásához le kell tölteni őket.\n"
+"Szeretnéd letölteni?"
 
 msgid "Download incomplete route relation members"
-msgstr ""
+msgstr "Fékész útvonalkapcsolat tagok letöltése"
 
 msgid "Include stop_area tests"
-msgstr ""
+msgstr "Vegye bele a stop_area teszteket"
 
 msgid "PT_Assistant plugin found that this relation (id={0}) has errors:"
 msgstr ""
+"A PT_Assistant bővítmény szerint ez a kapcsolat  (id={0}) hibákat tartalmaz:"
 
 msgid "{0} direction error"
 msgid_plural "{0} direction errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} irány hiba"
+msgstr[1] "{0} irány hiba"
 
 msgid "{0} road type error"
 msgid_plural "{0} road type errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} úttípus hiba"
+msgstr[1] "{0} úttípus hiba"
 
 msgid "How do you want to proceed?"
-msgstr ""
+msgstr "Hogyan szeretnéd folytatni?"
 
 msgid "PT_Assistant Proceed Request"
-msgstr ""
+msgstr "PT_Assistant Folytatás Kérés"
 
 msgid "PT: Stop_position is not part of a way"
-msgstr ""
+msgstr "PT: a stop_position nem része vonalnak"
 
 msgid "PT: Platform should not be part of a way"
-msgstr ""
+msgstr "PT: a platform nem lehet vonal része"
 
 msgid "PT: Stop position or platform is not part of a stop area relation"
-msgstr ""
+msgstr "PT: a megállóhely vagy platform nem része stop_area kapcsolatnak"
 
 msgid "PT_Assistant Message"
-msgstr ""
+msgstr "PT_Assistant Üzenet"
 
 msgid "Public Transport Assistant tests"
-msgstr ""
+msgstr "Tömegközlekedés Asszisztens tesztek"
 
 msgid ""
 "Check if route relations are compatible with public transport version 2"
 msgstr ""
+"Annak ellenőrzése, hogy az útvonalkapcsolat kompatibilis-e a public "
+"transport séma 2-es verziójával"
 
 msgid "Fix error"
-msgstr ""
+msgstr "Hiba javítása"
 
 msgid "PT: dummy test warning"
-msgstr ""
+msgstr "PT: színlelt tesz figyelmeztetés"
 
 msgid "PT: Route contains a gap that can be fixed by sorting"
-msgstr ""
+msgstr "PT: az útvonal szakadást tartalmaz, ami javítható sorbarendezéssel"
 
 msgid "PT: Relation member roles do not match tags"
-msgstr ""
+msgstr "PT: a kapcsolat tagok címkéi nem egyeznek"
 
 msgid "PT: Route should start and end with a stop_position"
-msgstr ""
+msgstr "PT: az útvonal stop_position taggal kell kezdődjön és végződjön"
 
 msgid "PT: First or last way needs to be split"
-msgstr ""
+msgstr "PT: az első vagy utolsó vonalat el kell vágni"
 
 msgid "PT: Problem in the route segment"
-msgstr ""
+msgstr "PT: probléma az útszakaszban"
 
 msgid "PT: Stop not served"
-msgstr ""
+msgstr "PT: a megálló nincs kiszolgálva"
 
 msgid "PT: Problem in the route segment with no automatic fix"
-msgstr ""
+msgstr "PT: probléma az útszakaszban automatikus javítás nélkül"
 
 msgid "PT: Problem in the route segment with one automatic fix"
-msgstr ""
+msgstr "PT: probléma az útszakaszban egy automatikus javítással"
 
 msgid "Warning: the diplayed fix variants are based on less strict criteria"
 msgstr ""
+"Figyelem: a megjelenített javítás változatok egy kevésbé szigorú kritériumon "
+"alapulnak"
 
 msgid "Type letter to select the fix variant or press Escape for no fix"
 msgstr ""
+"Egy javítás változat kiválasztásához nyomj egy betűt, vagy Escapet a javítás "
+"kihagyásához"
 
 msgid "PT: Stop area relation has no stop position"
-msgstr ""
+msgstr "PT: a stop area kapcsolatban nincs stop position"
 
 msgid "PT: Stop area relation has no platform"
-msgstr ""
+msgstr "PT: a stop area kapcsolatban nincs platform"
 
 msgid ""
 "PT: Route relations of stop position(s) and platform(s) of stop area members "
@@ -31431,13 +31728,16 @@ msgid ""
 msgstr ""
 
 msgid "PT: Route type does not match the type of the road it passes on"
-msgstr ""
+msgstr "PT: az útvonal típusa nem egyezik az út típusával, amin halad"
 
 msgid "PT: Road is under construction"
-msgstr ""
+msgstr "PT: az út építés alatt áll"
 
 msgid "PT: Route passes a oneway road in the wrong direction"
-msgstr ""
+msgstr "PT: az útvonal egyirányú úton halad ellentétes irányba"
+
+msgid "moved"
+msgstr "mozgatott"
 
 msgid "rail"
 msgstr "sín"
@@ -31536,9 +31836,6 @@ msgstr "Elkap"
 msgid "Join"
 msgstr "Összekapcsol"
 
-msgid "moved"
-msgstr "mozgatott"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Tömegközlekedés: GTFSStops összekapcsolása"
 
@@ -31570,7 +31867,7 @@ msgid "Route patterns ..."
 msgstr "Útvonal minták..."
 
 msgid "Edit Route patterns for public transport"
-msgstr ""
+msgstr "Tömegközlekedési útvonalminták  szerkesztése"
 
 msgid "Route Patterns"
 msgstr "Útvonal Minták"
@@ -31621,31 +31918,31 @@ msgid "left hand side"
 msgstr "bal oldali"
 
 msgid "Maximum distance from route"
-msgstr ""
+msgstr "Maximális távolság az úttól"
 
 msgid "Public Transport: Change stop type"
-msgstr ""
+msgstr "Tömegközlekedés: Megállótípus módosítása"
 
 msgid "Create Stops from GPX ..."
-msgstr ""
+msgstr "Megállók készítése GPX-ből…"
 
 msgid "Create Stops from a GPX file"
-msgstr ""
+msgstr "Megállók készítése GPX-fájlból"
 
 msgid "Select GPX file"
-msgstr ""
+msgstr "GPX-fájl kiválasztása"
 
 msgid "The GPX file contained no tracks or waypoints."
-msgstr ""
+msgstr "A GPX-fájl nem tartalmazott nyomvonalat vagy útpontot."
 
 msgid "Create Stops from GPX"
-msgstr ""
+msgstr "Megállók készítése GPX-ből"
 
 msgid "Tracks in this GPX file:"
-msgstr ""
+msgstr "Nyomvonalak a GPX-ben:"
 
 msgid "Detach"
-msgstr ""
+msgstr "Leválasztás"
 
 msgid "implicit"
 msgstr ""
@@ -31654,9 +31951,11 @@ msgid ""
 "The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
 "has trackpoints."
 msgstr ""
+"A GPX-fájl nem tartalmaz érvényes nyomvonalpontot. Kérlek, használj olyan "
+"GPX-et, amiben van nyomvonalpont."
 
 msgid "GPX File Trouble"
-msgstr ""
+msgstr "GPX-fájl gond"
 
 msgid "unnamed"
 msgstr "névtelen"
@@ -31698,55 +31997,57 @@ msgid "Public Transport: Edit waypoint name"
 msgstr ""
 
 msgid "Distance between stops"
-msgstr ""
+msgstr "Megállók közti távolság"
 
 msgid "A valid public_transport:version=2 route is required"
-msgstr ""
+msgstr "Érvényes, public_transport:version=2 típusú útvonal szükséges"
 
 msgid "Invalid selection"
-msgstr ""
+msgstr "Érvénytelen kiválasztás"
 
 msgid "Public transport routes"
-msgstr ""
+msgstr "Tömegközlekedési útvonalak"
 
 msgid "Toggle direction arrows"
-msgstr ""
+msgstr "Irány nyilak átkapcsolása"
 
 msgid "Toggle reference labels"
-msgstr ""
+msgstr "Azonosító címkék átkapcsolása"
 
 msgid "Visualize public transport routes"
-msgstr ""
+msgstr "Tömegközlekedési útvonalak vizualizálása"
 
 msgid "Filters"
-msgstr ""
+msgstr "Szűrők"
 
 msgid "Choose Filter"
-msgstr ""
+msgstr "Szűrőválasztás"
 
 msgid "JSlider initialization error. Make sure your meta-inf is correct."
 msgstr ""
+"JSlider inicializálási hiba. Győződj meg arról, hogy a meta-inf helyes."
 
 msgid "Relation Toolbox"
-msgstr ""
+msgstr "Kapcsolat Eszköztár"
 
 msgid "Open relation/multipolygon editor panel"
-msgstr ""
+msgstr "Kapcsolat/multipoligon szerkesztőpanel megnyitása"
 
 msgid "Specify role"
-msgstr ""
+msgstr "Szerep megadása"
 
 msgid "Change relation member roles to {0}"
-msgstr ""
+msgstr "Kapcsolattagok szerepének módosítása erre: {0}"
 
 msgid "Create administrative boundary relations"
-msgstr ""
+msgstr "Közigazgatási határ kapcsolatok készítése"
 
 msgid "Add tags boundary and admin_level to boundary relation ways"
 msgstr ""
+"Boundary és admin_level címkék hozzáadása a határvonal kapcsolat vonalaihoz"
 
 msgid "Move area tags from contour to relation"
-msgstr ""
+msgstr "A terület címkék áthelyezés a körvonalról a kapcsolatra"
 
 msgid "When moving tags, consider even non-repeating ones"
 msgstr ""
@@ -31755,43 +32056,43 @@ msgid "Always split ways of neighbouring multipolygons"
 msgstr ""
 
 msgid "Change role"
-msgstr ""
+msgstr "Szerep módosítása"
 
 msgid "Enter role for selected members"
-msgstr ""
+msgstr "Kijelölt tagok szerepének megadása"
 
 msgid "Relation Toolbox: {0}"
-msgstr ""
+msgstr "Kapcsolat Eszköztár: {0}"
 
 msgid "another..."
 msgstr "másik..."
 
 msgid "Add/remove members from the chosen relation"
-msgstr ""
+msgstr "Tagok hozzáadása/törlése a kiválasztott kapcsolathoz"
 
 msgid "Clear the chosen relation"
 msgstr ""
 
 msgid "Create a multipolygon from selected objects"
-msgstr ""
+msgstr "Multipoligon létrehozás a kiválasztott objektumokból"
 
 msgid "Create multipolygons from rings"
-msgstr ""
+msgstr "Multipoligon létrehozás gyűrűkből"
 
 msgid "Move tags from ways to relation"
-msgstr ""
+msgstr "Címkék áthelyezése a vonalakról a kapcsolatra"
 
 msgid "Enter admin level and name for the border relation:"
-msgstr ""
+msgstr "Add meg a határvonal kapcsolat közigazgatási szintjét és nevét:"
 
 msgid "Admin level"
-msgstr ""
+msgstr "Közigazgatási szint"
 
 msgid "Create a relation from selected objects"
-msgstr ""
+msgstr "Kapcsolat létrehozása a kijelölt objektumokból"
 
 msgid "Choose a type for the relation:"
-msgstr ""
+msgstr "Válassz egy típust a kapcsolat számára:"
 
 msgid "Delete relation"
 msgstr "Kapcsolat törlése"
@@ -31806,79 +32107,79 @@ msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
 msgid "Duplicate relation"
-msgstr "Duplikált kapcsolat"
+msgstr "Kapcsolat duplikálása"
 
 msgid "Open relation editor for the chosen relation"
-msgstr ""
+msgstr "A kiválasztott kapcsolat megnyitása szerkesztésre"
 
 msgid "Find a relation"
-msgstr ""
+msgstr "Kapcsolat keresése"
 
 msgid "Reconstruct polygon"
-msgstr ""
+msgstr "Poligon rekonstruálása"
 
 msgid "Multipolygon must consist only of ways"
-msgstr ""
+msgstr "A multipoligon csak vonalakból állhat"
 
 msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
+msgstr "A poligonok rekonstruálása csak külső vonalakból lehetséges"
 
 msgid "Reconstruct polygons from relation {0}"
-msgstr ""
+msgstr "Poligonok rekonstruálása {0} kapcsolatból"
 
 msgid "Reconstruct route"
-msgstr ""
+msgstr "Útvonal rekonstruálása"
 
 msgid "Open relation wiki page"
-msgstr ""
+msgstr "Kapcsolat wikioldalának megnyitása"
 
 msgid "Select relation in main selection."
 msgstr "Kapcsolat kiválasztása a globális kiválasztásban"
 
 msgid "Fix roles of the chosen relation members"
-msgstr ""
+msgstr "A kiválasztott kapcsolattagok szerepének javítása"
 
 msgid "Complete multipolygon for way {0}"
 msgstr ""
 
 msgid "Two rings are equal, and this must not be."
-msgstr ""
+msgstr "A két gyűrű megegyezik, pedig nem kéne."
 
 msgid "Multipolygon from rings"
-msgstr ""
+msgstr "Multipoligon gyűrűkből"
 
 msgid "Node without ''house'' role found"
-msgstr ""
+msgstr "„house” szerep nélküli pontot találtam"
 
 msgid "Way without ''house'' or ''street'' role found"
-msgstr ""
+msgstr "„house” vagy „street” szerep nélküli vonalat találtam"
 
 msgid "Relation without ''house'' role found"
-msgstr ""
+msgstr "„house” szerep nélküli kapcsolatot találtam"
 
 msgid "Relation does not have name"
-msgstr ""
+msgstr "A kapcsolatnak nincs neve"
 
 msgid "Relation has streets with different names"
-msgstr ""
+msgstr "A kapcsolat különböző nevű utcákat tartalmaz"
 
 msgid "fix associatedStreet relation"
-msgstr ""
+msgstr "associatedStreet kapcsolat javítása"
 
 msgid "Relation without ''subarea'' role found"
-msgstr ""
+msgstr "„subarea” szerep nélküli kapcsolatot találtam"
 
 msgid "Node without ''label'' or ''admin_centre'' role found"
-msgstr ""
+msgstr "„lable” vagy „admin_centre” szerep nélküli pontot találtam"
 
 msgid "Way without ''inner'' or ''outer'' role found"
-msgstr ""
+msgstr "„inner” vagy „outer” szerep nélküli vonalat találtam"
 
 msgid "Node without ''stop'' or ''platform'' role found"
-msgstr ""
+msgstr "„stop” vagy „platform” szerep nélküli pontot találtam"
 
 msgid "Way platform without ''platform'' role found"
-msgstr ""
+msgstr "„platform” szerep nélküli platform vonalat találtam"
 
 msgid "Revert changeset fully"
 msgstr "Módosításcsomag teljes visszaállítása"
@@ -31903,13 +32204,13 @@ msgid "Reverted changeset"
 msgstr "Visszaállított módosításcsomag"
 
 msgid "It is not allowed to revert changeset from {0}"
-msgstr ""
+msgstr "A módosításcsomag helyreállítása nem engedélyezett innen: {0}"
 
 msgid "Downloading objects history"
 msgstr "Objektumok előzményeinek letöltése"
 
 msgid "Missing merge target for {0} with id {1}"
-msgstr ""
+msgstr "Hiányzó egyesítési cél {0} számára {1} azonosítóval"
 
 msgid "Objects history"
 msgstr "Objektumok előzménye"
@@ -31918,13 +32219,14 @@ msgid "History reverter"
 msgstr "Előzmény visszállító"
 
 msgid "Tool: Display objects history dialog"
-msgstr ""
+msgstr "Eszköz: objektumelőzmény dialógusablak megjelenítése"
 
 msgid "Preparing history data..."
 msgstr "Előzmény adatok előkészítése…"
 
 msgid "Remote Control has been asked to revert a changeset."
 msgstr ""
+"A Távirányítón keresztül kérvényezve lett egy módosításcsomag visszaállítása"
 
 msgid "Reverting..."
 msgstr "Visszaállítás…"
@@ -31947,7 +32249,7 @@ msgid "Downloading changeset"
 msgstr "Módosításcsomag letöltése"
 
 msgid "See {0}"
-msgstr ""
+msgstr "Lásd {0}"
 
 msgid "Revert changeset #{0}"
 msgstr "#{0} módosításcsomag visszaállítása"
@@ -31956,11 +32258,15 @@ msgid ""
 "Warning: unsupported start element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
 msgstr ""
+"Figyelmeztetés: nem támogatott „{0}” kezdőelem a módosításcsomag tartalmában "
+"az alábbi helyen ({1},{2}). Kihagyás."
 
 msgid ""
 "Warning: unsupported end element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
 msgstr ""
+"Figyelmeztetés: nem támogatott „{0}” lezáróelem a módosításcsomag "
+"tartalmában az alábbi helyen ({1},{2}). Kihagyás."
 
 msgid "Road Sign Plugin"
 msgstr "Közlekedés jelzőtábla bővítmény"
@@ -31996,13 +32302,13 @@ msgid "Slovakia"
 msgstr "Szlovákia"
 
 msgid "Roadsign tagging"
-msgstr ""
+msgstr "Jelzőtábla címkézés"
 
 msgid "Add tags by clicking on road signs"
-msgstr ""
+msgstr "Címkék hozzáadása a jelzőtáblára kattintással"
 
 msgid "Roadsigns plugin: open dialog"
-msgstr ""
+msgstr "Jelzőtábla bővítmény: dialógusablak megnyitása"
 
 msgid "custom"
 msgstr "egyéni"
@@ -32011,31 +32317,31 @@ msgid "Could not read tagging preset source: ''{0}''"
 msgstr "Nem olvasható címkézési készlet forrás: ''{0}''"
 
 msgid "Error parsing tagging preset from ''{0}'':\n"
-msgstr ""
+msgstr "Nem sikerült értelmezni a címkekészletet innen: „{0}”:\n"
 
 msgid "Sign {0}"
 msgstr "Aláírás {0}"
 
 msgid "Additional sign {0}"
-msgstr ""
+msgstr "További {0} tábla"
 
 msgid "Edit relation"
-msgstr ""
+msgstr "Kapcsolat szerkesztése"
 
 msgid "Edit relations"
-msgstr ""
+msgstr "Kapcsolatok szerkesztése"
 
 msgid "No relation is selected"
-msgstr ""
+msgstr "Nincs kapcsolat kiválasztva"
 
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "{1}. pozícióban lévő „{0}” pont eltávolítása „{2}” kapcsolatból"
 
 msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "{1}. pozícióban lévő „{0}” vonal eltávolítása „{2}” kapcsolatból"
 
 msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "{1}. pozícióban lévő „{0}” kapcsolat eltávolítása „{2}” kapcsolatból"
 
 msgid "routing active route"
 msgstr ""
@@ -32265,13 +32571,13 @@ msgid "Select none"
 msgstr ""
 
 msgid "Min Distance:"
-msgstr ""
+msgstr "Min. távolság"
 
 msgid "Input min distance"
-msgstr ""
+msgstr "Input minimális távolság"
 
 msgid "Align all buildings"
-msgstr ""
+msgstr "Összes épület igazítása"
 
 msgid "Delete overlay"
 msgstr ""
@@ -32563,6 +32869,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terasz"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -33014,6 +33380,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Előre"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Visszafelé"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Nincs ilyen sáv."
 
@@ -33835,19 +34279,19 @@ msgid "Create a circle arc"
 msgstr "Körívet készít a meglévő vonalból"
 
 msgid "Select custom URL"
-msgstr ""
+msgstr "Egyedi URL kiválasztása"
 
 msgid "Please select one of custom URLs (configured in Preferences)"
-msgstr ""
+msgstr "Válasszon ki egy egyedi URL-t (konfigurálható a Beállítások között)"
 
 msgid "Ask every time"
 msgstr ""
 
 msgid "Configure custom URL"
-msgstr ""
+msgstr "Egyedi URL beállítása"
 
 msgid "Open custom URL"
-msgstr ""
+msgstr "Egyedi URL megnyitása"
 
 msgid "Opens specified URL browser"
 msgstr ""
@@ -33875,7 +34319,7 @@ msgid ""
 msgstr ""
 
 msgid "Custom URL configuration"
-msgstr ""
+msgstr "Egyedi URL konfigurálás"
 
 msgid "Lat Lon tool"
 msgstr "Koordináta eszköz"
@@ -33965,9 +34409,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Geometria cseréje"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "A kiválasztott objektum geometriájának lecserélése egy újra"
 
@@ -34021,7 +34462,7 @@ msgid "Replace geometry for way {0}"
 msgstr "{0} vonal geometriájának lecserélése"
 
 msgid "Replace Membership"
-msgstr ""
+msgstr "Kapcsolatok átadása"
 
 msgid ""
 "In relations where the selected object is member of, replace it with a new "
@@ -34068,7 +34509,7 @@ msgid "Select all connected ways"
 msgstr "Összes olyan vonal kiválasztása, amik elérhetőek ebből a vonalból"
 
 msgid "Intersecting ways"
-msgstr "Kersztezett vonalak"
+msgstr "Keresztezett vonalak"
 
 msgid "Select intersecting ways"
 msgstr "A kiválasztott vonalat keresztező vonalak kiválasztása"
@@ -34079,7 +34520,7 @@ msgstr ""
 "megtalálásához!"
 
 msgid "All intersecting ways"
-msgstr "Összes kersztezett vonal"
+msgstr "Összes keresztezett vonal"
 
 msgid "Select all intersecting ways"
 msgstr "Összes keresztezett vonal kiválasztása"
@@ -34180,15 +34621,9 @@ msgstr "Videó visszajátszást indít/megállít"
 msgid "Video: {0}"
 msgstr "Videó: {0}"
 
-msgid "Backward"
-msgstr "Visszafelé"
-
 msgid "jumps n sec back"
 msgstr "n másodperccel vissza"
 
-msgid "Forward"
-msgstr "Előre"
-
 msgid "jumps n sec forward"
 msgstr "n másodperccel előre"
 
@@ -34414,16 +34849,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 msgid "Search Wikidata items"
-msgstr ""
+msgstr "Wikidata elemek keresése"
 
 msgid "Target key: "
-msgstr ""
+msgstr "Cél kulcs: "
 
 msgid "Search Wikipedia category"
-msgstr ""
+msgstr "Wikipédia kategória keresése"
 
 msgid "Load category"
-msgstr ""
+msgstr "Kategória betöltése"
 
 msgid "Fetch Wikipedia articles with coordinates"
 msgstr "Wikipédia cikkeket hoz el koordinátákkal"
@@ -34445,13 +34880,13 @@ msgid "Not linked yet"
 msgstr "Nincs még hivatkozás"
 
 msgid "{0}: {1}"
-msgstr ""
+msgstr "{0}: {1}"
 
 msgid "Wikidata"
-msgstr ""
+msgstr "Wikidata"
 
 msgid "Fetches all coordinates from Wikidata in the current view"
-msgstr ""
+msgstr "A jelenlegi nézet összes koordinátájának lekérése Wikidatáról"
 
 msgid "Fetches all coordinates from Wikipedia in the current view"
 msgstr "Minden koordinátát elhoz a Wikipédiából, az aktuális nézet szerint"
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index 492bc88..f00167e 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:36+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:33+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: hy\n"
 
 msgid "Cancel"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 02ce8f5..2ec7aa3 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:03+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:51+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ia\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/id.po b/i18n/po/id.po
index d38445e..5932240 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2016-03-10 03:36+0000\n"
 "Last-Translator: Ezagren <ezagren at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:04+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:51+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: id\n"
 "X-Language: id_ID\n"
 
@@ -210,18 +210,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Menambahkan Layer Citra {0}"
 
-msgid "Error"
-msgstr "Kesalahan"
-
-msgid "Select image format for WMS layer"
-msgstr "Pilih format gambar untuk layer WMS"
-
-msgid "Select WMS layers"
-msgstr "Pilih layer WMS"
-
-msgid "Add layers"
-msgstr "Tambahkan layer"
-
 msgid "Invalid service URL."
 msgstr "Layanan URL tidak valid"
 
@@ -234,6 +222,18 @@ msgstr "Tidak dapat mendapatkan daftar layer WMS"
 msgid "Could not parse WMS layer list."
 msgstr "Tidak dapat memisahkan daftar layer WMS."
 
+msgid "Error"
+msgstr "Kesalahan"
+
+msgid "Select image format for WMS layer"
+msgstr "Pilih format gambar untuk layer WMS"
+
+msgid "Select WMS layers"
+msgstr "Pilih layer WMS"
+
+msgid "Add layers"
+msgstr "Tambahkan layer"
+
 msgid "Add Node..."
 msgstr "Tambahkan Node..."
 
@@ -3478,9 +3478,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3908,12 +3905,12 @@ msgstr "Beberapa relasi jalan terkait"
 msgid "House number without street"
 msgstr "Nomor rumah tanpa jalan"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Nomor rumah'' {0}'' digandakan"
-
 msgid "Duplicate house numbers"
 msgstr "Gandakan nomor rumah"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Nomor rumah'' {0}'' digandakan"
+
 msgid "Multiple street names in relation"
 msgstr "Beberapa nama jalan dalam relasi"
 
@@ -3948,6 +3945,9 @@ msgstr "Garis pantai"
 msgid "This test checks that coastlines are correct."
 msgstr "Tes ini menguji bahwa garis pantai telah benar."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Garis pantai terbalik: daratan tidak berada di sisi kiri"
+
 msgid "Unconnected coastline"
 msgstr "Garis pantai yang tidak tersambung"
 
@@ -3957,6 +3957,9 @@ msgstr "Garis pantai yang tidak teratur"
 msgid "Reversed coastline"
 msgstr "Garis pantai yang berubah arah"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3993,6 +3996,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4218,6 +4227,12 @@ msgstr "Peran tidak berguna untuk anggota multipoligon"
 msgid "Non-Way in multipolygon"
 msgstr "Bukan garis di multipoligon"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Nama yang hilang:*terjemahan"
 
@@ -4440,30 +4455,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Nilai properti mengandung  HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Key \"{0}\" tidak ada  pada preset"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr "Preset tidak mengandung kunci properti"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr ""
+msgid "Key ''{0}'' not in presets."
+msgstr "Key \"{0}\" tidak ada  pada preset"
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Value ''{0}'' untuk key ''{1}'' tidak ada di preset"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr "Preset tidak berisi nilai properti"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Value ''{0}'' untuk key ''{1}'' tidak ada di preset"
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4713,9 +4728,6 @@ msgstr "Garis yang dirangkai salah"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Tes ini memeriksa arah aliran air, permukaan tanah dan garis pantai"
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Garis pantai terbalik: daratan tidak berada di sisi kiri"
-
 msgid "Reversed land: land not on left side"
 msgstr "Daratan terbalik: daratan tidak berada di sisi kiri"
 
@@ -5246,9 +5258,6 @@ msgstr "Garis bujur geografis pada penunjuk mouse."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "Layer tidak terdapat dalam daftar"
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6722,6 +6731,9 @@ msgstr ""
 msgid "Sort"
 msgstr "sortir"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tipe objek:"
 
@@ -6963,6 +6975,14 @@ msgstr "Unduh isi set perubahan"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Unduh isi set perubahan yang dipilih dari server"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Set perubahan saya"
 
@@ -8322,9 +8342,6 @@ msgstr "Masukkan sebuah nama tempat untuk dicari"
 msgid "Areas around places"
 msgstr "Area di sekitar tempat"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Pengecualian pointer nol, Kemungkinan ada tag yang hilang"
-
 msgid "Search ..."
 msgstr "Cari ..."
 
@@ -8953,6 +8970,9 @@ msgstr "Perubahan tidak tersimpan - Simpan/Unggah sebelum dikeluarkan?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Perubahan tidak tersimpan - Simpan/Unggah sebelum dihapus?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Mengunggah dan menyimpan lapisan yang termodifikasi..."
 
@@ -9011,6 +9031,12 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "Keluar dari JOSM tanpa menyimpan. Perubahan yang tidak disimpan akan hilang."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Hapus sekarang!"
 
@@ -9026,6 +9052,12 @@ msgstr ""
 "Keluar JOSM dengan menyimpan. Perubahan yang tidak tersimpan akan diupload "
 "dan/atau disimpan."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Melakukan tindakan sebelum menghapus"
 
@@ -11276,6 +11308,9 @@ msgstr "Menggambar arah panah satu jalan"
 msgid "Draw segment order numbers"
 msgstr "Menggambar segmen urutan angka"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Menggambar pembatas  dari data yang terdownload"
 
@@ -13504,6 +13539,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "import NMEA gagal"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Pengecualian pointer nol, Kemungkinan ada tag yang hilang"
+
 msgid "Note Files"
 msgstr ""
 
@@ -13890,6 +13928,9 @@ msgstr "Mengupload data ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Bukan pengeculaian id 0 untuk osm primitif ditemukan"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "Mengunduh data..."
 
@@ -15683,6 +15724,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15794,7 +15838,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15973,6 +16020,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16267,18 +16317,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -16288,6 +16326,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -16420,6 +16461,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -16801,6 +16845,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "download data OSM di sepanjang way/garis"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16936,6 +16983,9 @@ msgstr ""
 "Menciptakan digraf saluran dan memeriksa bagian dari saluran jika itu adalah "
 "persimpangan atau pencarian dalam subset dari saluran untuk sambungan"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Membantu vektor gambar WMS."
 
@@ -17165,6 +17215,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Membuat rumah bertingkat keluar dari blok tunggal."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17192,6 +17247,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin untuk tanda digital OSM-Data"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17360,6 +17418,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "lapangan"
 
@@ -18680,6 +18742,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Ford"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Jalur"
 
@@ -20308,6 +20373,9 @@ msgstr "Landasan Pacu"
 msgid "Taxiway"
 msgstr "Jalur Taksi"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Landasan Helikopter"
 
@@ -20978,11 +21046,11 @@ msgstr "Nomor titik"
 msgid "Point Name"
 msgstr "Nama titik"
 
-msgid "Phone Number"
-msgstr "NomorTelepon"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Gunakan kode internasional, seperti +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Dokter Hewan"
@@ -20996,6 +21064,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "NomorTelepon"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -21865,6 +21939,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -21949,6 +22027,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -24154,7 +24236,13 @@ msgstr "Hutan lindung"
 msgid "Scree"
 msgstr "Reruntuhan batuan"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -24823,16 +24911,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -24841,18 +24923,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24865,18 +24935,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -25069,9 +25127,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -25081,6 +25150,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -25096,39 +25171,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr "restauran tanpa nama"
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr "air alami yang digunakan untuk kolam renang"
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25147,9 +25207,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} sudah usang"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -25204,10 +25273,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -25223,7 +25298,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25268,7 +25343,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -25302,6 +25377,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr "mempersingkat nama jalan"
 
@@ -25320,6 +25398,9 @@ msgstr "Jalan raya tanpa referensi"
 msgid "temporary highway type"
 msgstr "jenis jalan raya yang temporer"
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr "nama jalan berisi ss"
 
@@ -25410,10 +25491,13 @@ msgstr "golongan agama Yahudi tidak diketahui"
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -25669,6 +25753,27 @@ msgstr "Mengupload trek GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Menggunggah jejak ke openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Mengimpor..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Skala:"
+
+msgid "unit(s) = "
+msgstr "unit(s) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Menunjukkan profil ketinggian"
 
@@ -26021,6 +26126,403 @@ 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 "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr ""
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr ""
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr "Login"
+
+msgid "Logout"
+msgstr "Keluar"
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -27817,9 +28319,6 @@ 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"
 
@@ -27851,9 +28350,6 @@ msgstr "Chat pribadi"
 msgid "Close tab"
 msgstr "Tutup tab"
 
-msgid "Logout"
-msgstr "Keluar"
-
 msgid "Clear log"
 msgstr "Hapus catatan"
 
@@ -28436,9 +28932,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -28626,21 +29119,9 @@ msgstr "Gambar diimport"
 msgid "Import vector graphics"
 msgstr "Import vektor grafik"
 
-msgid "Scale:"
-msgstr "Skala:"
-
-msgid "unit(s) = "
-msgstr "unit(s) = "
-
-msgid "Importing..."
-msgstr "Mengimpor..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -28855,6 +29336,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "menghasilkan semua kombinasi dari masukan/keluar kandidat"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Ganti Geometri"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Indeks arah \"{0}\" tidak ditemukan"
 
@@ -29122,400 +29658,6 @@ msgstr "Mengaktifkan plugin MapDust bug reporter"
 msgid "Missing input data"
 msgstr "Input data hilang"
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Nilai ukuran"
 
@@ -31038,6 +31180,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "Telah dipindahkan"
+
 msgid "rail"
 msgstr "rel"
 
@@ -31135,9 +31280,6 @@ msgstr "Ambil"
 msgid "Join"
 msgstr "Gabung"
 
-msgid "moved"
-msgstr "Telah dipindahkan"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Transportasi Umumr: Gabungkan pemberhentian GTFS"
 
@@ -32194,6 +32336,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terrace"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -32663,6 +32865,84 @@ msgstr "Pilih tanggal kadaluwarsa untuk key:"
 msgid "Create a new signing key"
 msgstr "Buat key penandatanganan baru"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Maju"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "ke belakang"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Tidak ada jalur tersebut"
 
@@ -33615,9 +33895,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Ganti Geometri"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Ganti geometri dari objek yang dipilih dengan yang baru"
 
@@ -33831,15 +34108,9 @@ msgstr "Memulai/menghentikan pemutaran video"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "ke belakang"
-
 msgid "jumps n sec back"
 msgstr "lompat dalam beberapa detik ke belakang"
 
-msgid "Forward"
-msgstr "Maju"
-
 msgid "jumps n sec forward"
 msgstr "Lompat beberapa detik kedepan"
 
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 71135be..3f1399c 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:02+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:50+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: is\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -205,28 +205,28 @@ msgstr "Henda hlutum út úr vallistanum sem eru ekki valdir á honum."
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Villa"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Villa"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3297,9 +3297,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3701,10 +3698,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3741,6 +3738,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3750,6 +3750,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3786,6 +3789,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4004,6 +4013,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4214,30 +4229,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4481,9 +4496,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5006,9 +5018,6 @@ msgstr "Lengdargráðan undir músabendlinum."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6428,6 +6437,9 @@ msgstr ""
 msgid "Sort"
 msgstr "Raða"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6669,6 +6681,14 @@ msgstr "Sækja innihald breytinga-setts"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Sækja innihald valinna breytingar-setta frá miðlara"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7946,9 +7966,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Núll bendill, hugsanlega vantar eigindi."
-
 msgid "Search ..."
 msgstr ""
 
@@ -8515,6 +8532,9 @@ msgstr "Óvistaðar breytingar - Vista eða upphala áður en forritinu er loka
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Óvistaðar breytingar - Vista eða upphala áður en þú eyðir?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Hleð upp og vista breyttum lögum ..."
 
@@ -8566,6 +8586,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8578,6 +8604,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10637,6 +10669,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Teikna mörk sóttra gagna"
 
@@ -12728,6 +12763,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Núll bendill, hugsanlega vantar eigindi."
+
 msgid "Note Files"
 msgstr ""
 
@@ -13091,6 +13129,9 @@ msgstr "Hleð upp gögnum ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14737,6 +14778,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14848,7 +14892,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15027,6 +15074,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15321,18 +15371,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15342,6 +15380,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15474,6 +15515,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15841,6 +15885,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Sækir OSM gögn meðfram vegi"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15956,6 +16003,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16153,6 +16203,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16175,6 +16230,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16331,6 +16389,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17651,6 +17713,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Vað"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Vegir"
 
@@ -19270,6 +19335,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19940,10 +20008,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19958,6 +20026,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20827,6 +20901,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20911,6 +20989,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23116,7 +23198,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23783,16 +23871,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23801,18 +23883,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23825,18 +23895,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24029,9 +24087,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24041,6 +24110,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24056,39 +24131,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24107,9 +24167,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24164,10 +24233,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24183,7 +24258,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24228,7 +24303,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24262,6 +24337,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24280,6 +24358,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24370,10 +24451,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24619,6 +24703,27 @@ msgstr "Hleð upp GPX ferli"
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24957,3267 +25062,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Align Ways"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Choose from..."
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid "Select commune"
+msgid "Length preserved"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Angle preserved"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
-msgstr "Teiknið ytri mörk gagna sem á að sækja."
-
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr "Teiknaðu rétthyrning um sótt gögn frá WMS miðlara."
+msgid "Building:"
+msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "show address dialog"
 msgstr ""
 
-msgid "Downloading {0}"
-msgstr "Sæki {0}"
-
-msgid "Contacting WMS Server..."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Create buildings"
+msgid "merge nodes"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Debug"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Create boundary"
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Alert Message"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Street Name:"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Create building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
-msgstr "Sæki mynd frá \"French Cadastre WMS\""
-
-msgid "Cadastre: {0}"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "Length step:"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
+msgid "Advanced..."
 msgstr ""
 
-msgid "{0} not allowed with the current projection"
+msgid "Draw buildings"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Set width of the building"
 msgstr ""
 
-msgid "(optional)"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Change location"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "Commune"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+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] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid "Departement"
+msgid "on polygon"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Add address"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Next no"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Reset cookie"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid "Select Feuille"
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Image cropping"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
 msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
 msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Choose from..."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Select commune"
 msgstr ""
 
-msgid "East"
+msgid "Auto sourcing"
 msgstr ""
 
-msgid "I use the mouse"
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "Reset offset"
-msgstr ""
+msgid "Draw boundaries of downloaded data."
+msgstr "Teiknið ytri mörk gagna sem á að sækja."
 
-msgid "Reset offset (only vector images)"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "Blank Layer"
-msgstr "Tómt lag"
-
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Is vectorized."
+msgid "off"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "50 m"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "100 m"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "high"
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "medium"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "low"
 msgstr ""
 
-msgid "Use"
+msgid "symbol"
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "parcel"
 msgstr ""
 
-msgid "Color Scheme"
+msgid "parcel number"
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid "address"
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "locality"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "section"
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "commune"
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflation"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Matches"
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Reference only"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Subject only"
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Draw a rectangle around downloaded data from WMS server."
+msgstr "Teiknaðu rétthyrning um sótt gögn frá WMS miðlara."
+
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Configure"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Conflate"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Layers:"
 msgstr ""
 
-msgid "Match finder method"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Parcels."
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Layer:"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Subject"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Empty selection"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "Freeze reference selection"
-msgstr ""
+msgid "Downloading {0}"
+msgstr "Sæki {0}"
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Create buildings"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Image already loaded"
 msgstr ""
 
 msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "Requires restart"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Max threads"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
-msgstr ""
+msgid "Download Image from French Cadastre WMS"
+msgstr "Sæki mynd frá \"French Cadastre WMS\""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Extra download area"
+msgid "Georeference an image"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid "Max download area"
+msgid "Georeferencing interrupted"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Split area"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
 msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "(optional)"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Change location"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Commune"
 msgstr ""
 
-msgid "Download along..."
-msgstr "Sæki meðfram..."
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
+msgstr ""
 
-msgid "Download OSM data along the selected ways."
-msgstr "Sækja OSM gögn meðfram völdum vegum."
+msgid "Departement"
+msgstr ""
 
-msgid "Download Along"
-msgstr "Sækja Meðfram"
+msgid "<html>Departement number (optional)</html>"
+msgstr ""
 
-msgid "Please select 1 or more ways to download along"
-msgstr "Veldu einn eða fleiri vegi sen á að sækja gögn meðfram"
+msgid "Add new layer"
+msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "EditGpx"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Drop existing path"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Image georeferencing"
 msgstr ""
 
 msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Edit tool"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "East"
 msgstr ""
 
-msgid "External tools"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "New tool..."
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Install"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid "Public"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Reset offset"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
-msgstr ""
+msgid "Blank Layer"
+msgstr "Tómt lag"
 
-msgid "GeoChat"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "Login"
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Commune bbox: {0}"
+msgstr ""
 
-msgid "not logged in"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Users mapping nearby:"
+msgid "Use"
 msgstr ""
 
-msgid "Private chat"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Close tab"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Logout"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "Clear log"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Show users on map"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Color Schemes"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflation"
 msgstr ""
 
-msgid "Position only"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Reference only"
 msgstr ""
 
-msgid "A By Time"
+msgid "Subject only"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "B By Time"
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "C By Time"
+msgid "Configure"
 msgstr ""
 
-msgid "C By Distance"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Conflate"
 msgstr ""
 
-msgid "Port:"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "Configure Device"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "Connection Error."
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "Match finder method"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Threshold distance"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "Layer:"
 msgstr ""
 
-msgid "Import"
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Subject"
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "Restore subject selection"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Empty selection"
 msgstr ""
 
-msgid "Tag without key"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max threads"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid "Extra download area"
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "Split area"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
 msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "height (m)"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "width (m)"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "length (m)"
-msgstr ""
+msgid "Download along..."
+msgstr "Sæki meðfram..."
 
-msgid "speed (km/h)"
+msgid "Download OSM data along the selected ways."
+msgstr "Sækja OSM gögn meðfram völdum vegum."
+
+msgid "Download Along"
+msgstr "Sækja Meðfram"
+
+msgid "Please select 1 or more ways to download along"
+msgstr "Veldu einn eða fleiri vegi sen á að sækja gögn meðfram"
+
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "weight (t)"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "axleload (t)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "EditGpx"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "Access class"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Access types"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Road requirements"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "External tool error"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "External tools"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Are you sure?"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "New tool..."
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Install"
 msgstr ""
 
-msgid "default"
+msgid "Public"
 msgstr ""
 
-msgid "end nodes"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "incline"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Parameters:"
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "Coloring:"
+msgid "GeoChat"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "Graphview"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Ruleset"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Select directory"
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Vehicle"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "Visualization"
+msgid "Private chat"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Close tab"
 msgstr ""
 
-msgid "Node color"
+msgid "Clear log"
 msgstr ""
 
-msgid "Arrow color"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "New bookmark"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "Position only"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Choose node color"
+msgid "A By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "A By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "B By Time"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "B By Distance"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "C By Time"
 msgstr ""
 
-msgid "graphview default node"
+msgid "C By Distance"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "Port:"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "refresh the port list"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Connection Error."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "delete data after import"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "Importing data from device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Connection failed."
 msgstr ""
 
-msgid "Calibration Layer"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Change Color"
+msgid "Import"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "GPX Data"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Class element without name"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Tag without key"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "mm"
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "cm"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "m"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "km"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "Offset Information"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Determined right here"
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Reason"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
 msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "width (m)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "length (m)"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "speed (km/h)"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "weight (t)"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "axleload (t)"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Bookmark name"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Access class"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Access types"
 msgstr ""
 
-msgid "Normal"
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Road requirements"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "Rotate 270"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Previous image"
-msgstr "Fyrri mynd"
+msgid "Max. incline down (%, pos.)"
+msgstr ""
 
-msgid "Next image"
-msgstr "Næsta mynd"
+msgid "Maximum incline the vehicle can go down"
+msgstr ""
 
-msgid "Rotate left"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate image left"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Rotate right"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Imported Images"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Scale:"
+msgid "default"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "end nodes"
 msgstr ""
 
-msgid "Importing..."
+msgid "incline"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Parameters:"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Coloring:"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Graphview"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Ruleset"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "POWER"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Select directory"
 msgstr ""
 
-msgid "Working Level"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Restore defaults"
 msgstr ""
 
-msgid "Level Name"
+msgid "Visualization"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Node color"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "Fitting"
+msgid "New bookmark"
 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>"
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Lowest Level"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Choose node color"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "InfoMode"
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "GPX info mode"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+msgid "graphview default node"
 msgstr ""
 
-msgid "Delete this"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "Delete this&older"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "km/h"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
 msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "junctions"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Change Color"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
 msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
-msgstr ""
-
-msgid "create the channel digraph"
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Check "
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "Search "
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
 msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Offset"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid "mm"
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "cm"
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "km"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "Lake Walker."
-msgstr "Rekja vatn."
-
-msgid "Lake Walker"
-msgstr "Rekja vatn"
-
-msgid "Error creating cache directory: {0}"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Tracing"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "checking cache..."
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "An unknown error has occurred"
-msgstr "Óþekkt villa kom upp"
-
-msgid "east"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "northeast"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "north"
+msgid "Imagery ID"
 msgstr ""
 
-msgid "northwest"
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "west"
+msgid "Determined right here"
 msgstr ""
 
-msgid "southwest"
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "south"
+msgid "Reason"
 msgstr ""
 
-msgid "southeast"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "coastline"
-msgstr "strandlengja"
-
-msgid "land"
-msgstr "land"
+msgid "Server has rejected the request"
+msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "Direction to search for land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "WMS Layer"
-msgstr "WMS lag"
+msgid "This string should be 3 to 200 letters long."
+msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Source text"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "No layers to adjust"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Normal"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "Rotate 90"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Rotate 180"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Previous image"
+msgstr "Fyrri mynd"
+
+msgid "Next image"
+msgstr "Næsta mynd"
+
+msgid "Rotate left"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "Rotate image left"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Rotate right"
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Rotate image right"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Imported Images"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Downloading image tile..."
-msgstr "Sæki mynda-reit..."
+msgid "Concourse wizard ..."
+msgstr ""
 
-msgid "Could not acquire image"
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Not connected"
+msgid "Structure type:"
 msgstr ""
 
-msgid "Connecting"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Connected"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "no name"
+msgid "POWER"
 msgstr ""
 
-msgid "Live GPS"
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Working Level"
 msgstr ""
 
-msgid "Status"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Way Info"
+msgid "Level Name"
 msgstr ""
 
-msgid "Speed"
-msgstr "Hraði"
+msgid "Optional name-tag for a level."
+msgstr ""
 
-msgid "Course"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Center Once"
+msgid "Fitting"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid "Lowest Level"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Missing input data"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "InfoMode"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Total images:"
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "images"
+msgid "Delete this"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "km/h"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Track name: "
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "Export pictures"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Export images"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Import local pictures"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Select pictures"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Join mode"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Upload pictures."
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Walk mode"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "Check "
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "Search "
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Copy key"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Edit on website"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Submit"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Export all images"
+msgid "Correct"
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Wrong"
 msgstr ""
 
-msgid "Export selected images"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Select a folder"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Explore"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Select a directory"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Speed limit"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Give way"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "No entry"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "Replace way"
 msgstr ""
 
-msgid "Uneven road"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "No parking"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "No overtaking"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No turn"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Years"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Months"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Days"
+msgid "Lake Walker."
+msgstr "Rekja vatn."
+
+msgid "Lake Walker"
+msgstr "Rekja vatn"
+
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Imported images"
+msgid "Tracing"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Not older than: "
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Downloaded images"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Only images with signs"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Choose signs"
+msgid "An unknown error has occurred"
+msgstr "Óþekkt villa kom upp"
+
+msgid "east"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "northeast"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "north"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "northwest"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "south"
 msgstr ""
 
-msgid "Next picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "coastline"
+msgstr "strandlengja"
+
+msgid "land"
+msgstr "land"
+
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Play"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Pause"
+msgid "WMS Layer"
+msgstr "WMS lag"
+
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Source text"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Go forward"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Data source text. Default is Landsat."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr "Sæki mynda-reit..."
 
-msgid "2 images unjoined"
+msgid "Could not acquire image"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Not connected"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connecting"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "Connected"
 msgstr ""
 
-msgid "Downloading"
+msgid "no name"
 msgstr ""
 
-msgid "Select mode"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Status"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Way Info"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Speed"
+msgstr "Hraði"
+
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29679,6 +29821,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29774,9 +29919,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30788,6 +30930,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31235,6 +31437,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32061,9 +32341,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32257,15 +32534,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/it.po b/i18n/po/it.po
index d7df17d..a9a835d 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -4,16 +4,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-07-30 09:58+0000\n"
-"Last-Translator: Don-vip <Unknown>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-03 13:42+0000\n"
+"Last-Translator: Simon Legner <Unknown>\n"
 "Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:05+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:52+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: it\n"
 "X-Language: it_IT\n"
 "X-Source-Language: en\n"
@@ -213,18 +213,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Aggiungi livello di immagini aeree {0}"
 
-msgid "Error"
-msgstr "Errore"
-
-msgid "Select image format for WMS layer"
-msgstr "Seleziona il formato immagine per il livello WMS"
-
-msgid "Select WMS layers"
-msgstr "Seleziona il livello WMS"
-
-msgid "Add layers"
-msgstr "Aggiungi livelli"
-
 msgid "Invalid service URL."
 msgstr "Indirizzo URL del servizio non valido."
 
@@ -237,6 +225,18 @@ msgstr "Impossibile ottenere la lista dei livelli WMS."
 msgid "Could not parse WMS layer list."
 msgstr "Impossibile analizzare la lista dei livelli WMS."
 
+msgid "Error"
+msgstr "Errore"
+
+msgid "Select image format for WMS layer"
+msgstr "Seleziona il formato immagine per il livello WMS"
+
+msgid "Select WMS layers"
+msgstr "Seleziona il livello WMS"
+
+msgid "Add layers"
+msgstr "Aggiungi livelli"
+
 msgid "Add Node..."
 msgstr "Aggiungi nodo..."
 
@@ -493,10 +493,10 @@ msgid "Download notes in current view"
 msgstr "Scarica le note nella visualizzazione corrente"
 
 msgid "Download in current view"
-msgstr ""
+msgstr "Scarica la vista corrente"
 
 msgid "Download map data from the OSM server in current view"
-msgstr ""
+msgstr "Scarica i dati della vista corrente dal server OSM"
 
 msgid "Download object..."
 msgstr "Scarica oggetto..."
@@ -516,7 +516,7 @@ msgid "Duplicate"
 msgstr "Duplica"
 
 msgid "Duplicate selection."
-msgstr ""
+msgstr "Duplica la selezione"
 
 msgid "Exit"
 msgstr "Esci"
@@ -1152,13 +1152,14 @@ msgid "Paste"
 msgstr "Incolla"
 
 msgid "Paste contents of clipboard."
-msgstr ""
+msgstr "Incolla contenuto degli appunti."
 
 msgid "Paste at source position"
-msgstr ""
+msgstr "Incolla nella posizione originale"
 
 msgid "Paste contents of clipboard at the position they were copied from."
 msgstr ""
+"Incolla il contenuto degli appunti alla posizione da cui era stato copiato."
 
 msgid "Paste Tags"
 msgstr "Incolla le etichette"
@@ -1464,7 +1465,7 @@ msgstr[1] ""
 "il percorso."
 
 msgid "Which way segment should reuse the history of {0}?"
-msgstr ""
+msgstr "Quale segmento della via acquisisce la cronologia di {0}?"
 
 msgid " [id: {0}]"
 msgstr " [id: {0}]"
@@ -1625,8 +1626,8 @@ msgstr ""
 
 msgid "Unglueing affected {0} relation: {1}"
 msgid_plural "Unglueing affected {0} relations: {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "La separazione ha effetti su {0} relazione: {1}"
+msgstr[1] "La separazione ha effetti su {0} relazioni: {1}"
 
 msgid "Ensure that the relation has not been broken!"
 msgid_plural "Ensure that the relations have not been broken!"
@@ -2814,7 +2815,7 @@ msgid "all parents of objects matching the expression"
 msgstr "tutti i genitori degli oggetti che soddisfano l''espressione"
 
 msgid "relation containing a member of role <i>stop</i>"
-msgstr ""
+msgstr "relazione contenente un membro di ruolo <i>stop</i>"
 
 msgid "objects being part of a relation as role <i>stop</i>"
 msgstr ""
@@ -3079,7 +3080,7 @@ msgid "Change relation {0}"
 msgstr "Modifica relazione {0}"
 
 msgid "Change nodes of {0}"
-msgstr ""
+msgstr "Cambia i nodi di {0}"
 
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Rimuovi \"{0}\" per il nodo ''{1}''"
@@ -3633,9 +3634,6 @@ msgstr "Identificatore Matrix set"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Nessun livello selezionato da getCapabilities document: {0}"
 
-msgid "No layer selected"
-msgstr "Nessun livello selezionato"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4080,12 +4078,12 @@ msgstr "Relazioni strada associata (associated street) multiple"
 msgid "House number without street"
 msgstr "Numeri civici non associati ad una strada"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Numero civico ''{0}'' duplicato"
-
 msgid "Duplicate house numbers"
 msgstr "Numeri civici duplicati"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Numero civico ''{0}'' duplicato"
+
 msgid "Multiple street names in relation"
 msgstr "Nomi delle strade multipli nella relazione"
 
@@ -4123,6 +4121,9 @@ msgstr "Linee di costa"
 msgid "This test checks that coastlines are correct."
 msgstr "Questo controllo verifica che le linee di costa siano corrette."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Linea di costa invertita: terraferma non sul lato sinistro"
+
 msgid "Unconnected coastline"
 msgstr "Linea di costa non connessa"
 
@@ -4132,6 +4133,9 @@ msgstr "Linea di costa senza ordinamento"
 msgid "Reversed coastline"
 msgstr "Linea di costa invertita"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "Chiavi condizionali"
 
@@ -4168,6 +4172,12 @@ msgstr "Confini incrociati"
 msgid "Crossing barriers"
 msgstr "Barriere incrociate"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4404,6 +4414,12 @@ msgstr "Nessun ruolo utile per il membro del multi-poligono"
 msgid "Non-Way in multipolygon"
 msgstr "Nel multi-poligono è presente un elemento che non è un percorso"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Traduzione name:* mancante"
 
@@ -4635,32 +4651,32 @@ msgstr "I valori delle proprietà contengono più spazi bianchi"
 msgid "Property values contain HTML entity"
 msgstr "Il valore della proprietà contiene una entità HTML"
 
+msgid "Misspelled property key"
+msgstr "proprietà della chiava errata"
+
 msgid "Key ''{0}'' looks like ''{1}''."
 msgstr "La chiave ''{0}'' assomiglia a ''{1}''."
 
-msgid "Misspelled property key"
-msgstr "proprietà della chiava errata"
+msgid "Presets do not contain property key"
+msgstr "Le preimpostazioni non contengono la chiave della proprietà"
 
 msgid "Key ''{0}'' not in presets."
 msgstr "Chiave ''''{0}'''' non presente nelle preimpostazioni."
 
-msgid "Presets do not contain property key"
-msgstr "Le preimpostazioni non contengono la chiave della proprietà"
+msgid "Misspelled property value"
+msgstr "Valore della proprietà errata"
 
 msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr "Valore ''{0}'' per chiave ''{1}'' sembra ''{2}''."
 
-msgid "Misspelled property value"
-msgstr "Valore della proprietà errata"
+msgid "Presets do not contain property value"
+msgstr "Le preimpostazioni non contengono il valore della proprietà"
 
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 "Valore ''''{0}'''' per la chiave ''''{1}'''' non presente nelle "
 "preimpostazioni."
 
-msgid "Presets do not contain property value"
-msgstr "Le preimpostazioni non contengono il valore della proprietà"
-
 msgid "FIXMES"
 msgstr "FIXME"
 
@@ -4920,9 +4936,6 @@ msgstr ""
 "Questo controllo analizza la direzione dei corsi d''acqua, della terraferma "
 "e delle linee di costa."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Linea di costa invertita: terraferma non sul lato sinistro"
-
 msgid "Reversed land: land not on left side"
 msgstr "Terraferma invertita: manca la terraferma sul lato sinistro"
 
@@ -5192,7 +5205,7 @@ msgstr ""
 "Assicurarsi di caricare qualche dato se si utilizza il parametro --selection."
 
 msgid "Log level is at {0} ({1}, {2})"
-msgstr ""
+msgstr "Il livello di logging è {0} ({1}, {2})"
 
 msgid "Plugin loading skipped"
 msgstr "Caricamento pluging saltato"
@@ -5483,9 +5496,6 @@ msgstr "La longitudine geografica del puntatore del mouse."
 msgid "System of measurement changed to {0}"
 msgstr "Sistema di misurazione modificato in {0}"
 
-msgid "Layer not in list."
-msgstr "livello non in lista."
-
 msgid "Default (open, closed, new)"
 msgstr "Predefinito (opri, chiudi, nuovo)"
 
@@ -7066,6 +7076,9 @@ msgstr "Ordina note"
 msgid "Sort"
 msgstr "Ordina"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tipo oggetto:"
 
@@ -7318,6 +7331,14 @@ msgstr "Scarica il contenuto del gruppo di modifiche"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Scarica dal server il contenuto dei gruppi di modifiche selezionati"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Gruppi di modifiche personali"
 
@@ -8756,9 +8777,6 @@ msgstr "Inserire il nome di una località da ricercare"
 msgid "Areas around places"
 msgstr "Aree attorno le località"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Eccezione del puntatore nullo, è probabile che manchino alcuni tag."
-
 msgid "Search ..."
 msgstr "Cerca ..."
 
@@ -9125,7 +9143,7 @@ msgid ""
 msgstr ""
 
 msgid "Check \"Upload\" to upload the changes to the OSM server."
-msgstr ""
+msgstr "Spunta \"Upload\" per inviare le modifiche al server OSM."
 
 msgid "Check \"Save\" to save the layer to the file specified on the left."
 msgstr ""
@@ -9412,6 +9430,9 @@ msgstr "Modifiche non salvate - Salvare/caricare prima di uscire?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Modifiche non salvate - Salvare/caricare prima di eliminare?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Caricamento e salvataggio dei livelli modificati ..."
 
@@ -9481,6 +9502,12 @@ msgstr "Esci adesso!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Esci da JOSM senza salvare. Le modifiche non salvate saranno perse."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Elimina adesso!"
 
@@ -9495,6 +9522,12 @@ msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 "Esci da JOSM salvando. Le modifiche non salvate saranno caricate e/o salvate."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Esegui azioni prima di eliminare"
 
@@ -11860,6 +11893,9 @@ msgstr "Disegna le frecce dei sensi unici."
 msgid "Draw segment order numbers"
 msgstr "Disegna i numeri d''ordine dei segmenti"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Disegna i confini dei dati scaricati"
 
@@ -12790,13 +12826,13 @@ msgid "Configure the list of sites where plugins are downloaded from"
 msgstr "Configura la lista dei siti da dove sono scaricate le estensioni"
 
 msgid "Load from list..."
-msgstr ""
+msgstr "Carica da lista..."
 
 msgid "Load plugins from a list of plugins"
-msgstr ""
+msgstr "Carica plugin da una lista di plugin"
 
 msgid "Disable all other plugins"
-msgstr ""
+msgstr "Disabilita tutti gli altri plugin"
 
 msgid "Enter a list of plugins you want to download."
 msgstr ""
@@ -13916,7 +13952,7 @@ msgstr ""
 "zip ''{0}''. L''eccezione è stata: {1}"
 
 msgid "The requested URL {0} was not found"
-msgstr ""
+msgstr "L''URL richiesto {0} non è stato trovato"
 
 msgid "Failed to rename file {0} to {1}."
 msgstr "Fallita la rinominazione del file {0} in {1}."
@@ -14216,6 +14252,9 @@ msgstr "Importazione NMEA riuscita:"
 msgid "NMEA import failure!"
 msgstr "Importazione NMEA non riuscita!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Eccezione del puntatore nullo, è probabile che manchino alcuni tag."
+
 msgid "Note Files"
 msgstr "File delle note"
 
@@ -14636,6 +14675,9 @@ msgstr "Caricamento dati ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "È stato trovato un identificativo 0 non atteso per una primitiva osm"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "Scaricamento dei dati..."
 
@@ -16045,15 +16087,19 @@ msgstr "Ignora quest''errore."
 msgid ""
 "Opening the bug report failed. Please report manually using this website:"
 msgstr ""
+"Non è stato possibile avviare la segnalazione bug automatica. L''operazione "
+"dovrà essere svolta manualmente tramite il sito:"
 
 msgid "Include the system status report."
-msgstr ""
+msgstr "Includi informazioni sullo stato del computer."
 
 msgid "Include information about the data you were working on."
 msgstr ""
+"Includi informazioni sui dati in elaborazione al momento del verificarsi del "
+"problema."
 
 msgid "Include all stack traces."
-msgstr ""
+msgstr "Includi tutto il contenuto dello stack del programma."
 
 msgid "Your current version of JOSM is {0}"
 msgstr "La versione di JOSM sul tuo computer è {0}"
@@ -16575,6 +16621,9 @@ msgstr "Tiris: DGM (modello del terreno)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (modello superficie)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (mappa di vienne uso generico)"
 
@@ -16686,8 +16735,11 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16866,6 +16918,9 @@ msgstr "Drone Imagery 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortofoto 2000"
 
@@ -17160,18 +17215,6 @@ msgstr "Freemap.sk Cyclo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Ski"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakia Historic Maps"
 
@@ -17181,6 +17224,9 @@ msgstr "RABA-KGZ: Slovenia uso terreno agricolo"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slovenia aree edificate"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
@@ -17313,6 +17359,9 @@ msgstr "U.S. Forest Service strade"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -17708,6 +17757,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Scarica i dati OSM lungo un percorso"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17856,6 +17908,9 @@ msgstr ""
 "rappresenta un collegamento oppure ricerca i collegamenti in un sottoinsieme "
 "di canali"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Aiuta nella vettorizzazione delle immagini WMS."
 
@@ -18108,6 +18163,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Genera delle case a schiera da singoli blocchi."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -18139,6 +18199,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Estensione per firmare digitalmente i dati OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18309,6 +18372,10 @@ msgid "No wheeled vehicle"
 msgstr "Nessun veicolo a ruote"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "campo sportivo"
 
@@ -19637,6 +19704,9 @@ msgstr "in costruzione"
 msgid "Ford"
 msgstr "Guado"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Percorsi"
 
@@ -21283,6 +21353,9 @@ msgstr "Pista di decollo/atterraggio"
 msgid "Taxiway"
 msgstr "Pista di rullaggio"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Eliporto"
 
@@ -21954,11 +22027,11 @@ msgstr "Numero del punto"
 msgid "Point Name"
 msgstr "Nome del punto"
 
-msgid "Phone Number"
-msgstr "Numero di telefono"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -21972,6 +22045,12 @@ msgstr "Parcheggio delle Ambulanze"
 msgid "Automated Defibrillator"
 msgstr "Defibrillatore automatico"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Numero di telefono"
+
 msgid "Located inside a building?"
 msgstr "Presente all''interno di un edificio?"
 
@@ -22841,6 +22920,10 @@ msgid "university"
 msgstr "università"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "ospedale"
 
@@ -22925,6 +23008,10 @@ msgid "public"
 msgstr "pubblico"
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Livelli"
 
@@ -25139,8 +25226,14 @@ msgstr "Riserva naturale"
 msgid "Scree"
 msgstr "Ghiaione"
 
-msgid "An accumulation of loose rocks."
-msgstr "Un accumulo di pietre."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "Prato alpino"
@@ -25822,17 +25915,11 @@ msgstr "Itinerari"
 msgid "Bicycle Route"
 msgstr "Percorso ciclabile"
 
-msgid "icn"
-msgstr "icn"
-
-msgid "ncn"
-msgstr "ncn"
-
-msgid "rcn"
-msgstr "rcn"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "lcn"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Percorso per MTB"
@@ -25840,18 +25927,6 @@ msgstr "Percorso per MTB"
 msgid "Hiking Route"
 msgstr "Percorso escursionistico"
 
-msgid "iwn"
-msgstr "iwn"
-
-msgid "nwn"
-msgstr "nwn"
-
-msgid "rwn"
-msgstr "rwn"
-
-msgid "lwn"
-msgstr "lwn"
-
 msgid "infrastructure"
 msgstr "infrastruttura"
 
@@ -25864,18 +25939,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr "Piste"
 
@@ -26068,9 +26131,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr "Stesso valore per {0} e {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} senza {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} senza {1} o {2}"
 
@@ -26080,6 +26154,12 @@ msgstr "{0} senza {1}, {2} o {3}"
 msgid "{0} together with {1}"
 msgstr "{0} insieme a {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "oggetto incompleto: solo {0}"
 
@@ -26095,39 +26175,24 @@ msgstr "{0} insieme a {1} e valori in conflitto"
 msgid "{0} on suspicious object"
 msgstr "{0} su oggetto sospetto"
 
-msgid "restaurant without name"
-msgstr "ristorante senza nome"
-
-msgid "{0} used with {1}"
-msgstr "{0} utilizzato con {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "acqua naturale utilizzata per piscina"
 
 msgid "sport without physical feature"
 msgstr "sport senza caratteristica fisica"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} dovrebbe essere sul nodo dove {1} e {2} si incontrano"
-
 msgid "alternative name without {0}"
 msgstr "nome alternativo senza {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "uso di {0} incompleto con un tracciato senza {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Stesso valore per {0} e {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Stesso valore per {0}, {1} e {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} e {1} insieme a {2} e valori in conflitto"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Sospetta combinazione di etichette: {0} e {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -26146,9 +26211,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} è deprecata"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' è senza senso, utilizzare etichette più specifiche, es. ''{1}''"
@@ -26214,11 +26288,17 @@ msgstr "Etichetta non specificata {0}"
 msgid "Definition of {0} is unclear"
 msgstr "La definizione di {0} non è chiara."
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} non è consigliato. Usare la funzione Reverse Ways dal menu Strumenti."
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "chiave con carattere non comune"
 
@@ -26234,7 +26314,7 @@ msgstr "{0} è deprecato in favore di {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -26279,8 +26359,8 @@ msgstr "Aree naturali identiche sovrapposte"
 msgid "Overlapping Identical Landuses"
 msgstr "Utilizzi del terreno identici sovrapposti"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} dovrebbe essere collegato ad un tracciato"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "nodo connette via navigabile e ponte"
@@ -26313,6 +26393,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} dovrebbe essere sul nodo dove {1} e {2} si incontrano"
+
 msgid "abbreviated street name"
 msgstr "nome abbreviato della strada"
 
@@ -26331,6 +26414,9 @@ msgstr "Strada senza un riferimento"
 msgid "temporary highway type"
 msgstr "strada di tipo temporaneo"
 
+msgid "{0} used with {1}"
+msgstr "{0} utilizzato con {1}"
+
 msgid "street name contains ss"
 msgstr "nome di strada contenente ss"
 
@@ -26426,11 +26512,14 @@ msgstr "denominazione ebraica sconosciuta"
 msgid "{0} is unnecessary"
 msgstr "{0} non necessario"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} non è necessario per {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} senza senso"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Nodi che duplicano le etichette del percorso a cui appartengono"
@@ -26696,6 +26785,27 @@ msgstr "Caricamento del tracciato GPX in corso"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Carica i tracciati su openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importazione in corso..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "Si prega di aprire o creare un livello dati prima dell''importazione"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Scala:"
+
+msgid "unit(s) = "
+msgstr "unità = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Visualizza il profilo altimetrico"
 
@@ -27052,6 +27162,403 @@ 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 "Total images:"
+msgstr "Immagini totali:"
+
+msgid "images"
+msgstr "immagini"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Crea livello Mapillary"
+
+msgid "Start Mapillary layer"
+msgstr "Avvia livello 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 "Select pictures"
+msgstr "Seleziona foto"
+
+msgid "Import pictures into sequence"
+msgstr "Importa foto in sequenza"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importa foto in un livello Mapillary con una sequenza"
+
+msgid "Join mode"
+msgstr "modalità unisci"
+
+msgid "Join/unjoin pictures"
+msgstr "unisci/dividi foto"
+
+msgid "Join Mapillary pictures"
+msgstr "unisci foto Mapillary"
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr "Carica foto"
+
+msgid "Upload Mapillary pictures"
+msgstr "Carica foto Mapillary"
+
+msgid "Upload pictures."
+msgstr "Carica foto."
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr "Ingrandisci l''immagine selezionata"
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr "Visualizza nel sito"
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr "Modifica nel sito"
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr "Invia"
+
+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 folder"
+msgstr "Selezionare una cartella"
+
+msgid "Explore"
+msgstr "Esplora"
+
+msgid "Select a directory"
+msgstr "Selezionare una cartella"
+
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 ""
+
+msgid "Login"
+msgstr "Accedi"
+
+msgid "Logout"
+msgstr "Esci"
+
+msgid "Download mode"
+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 "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 "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 ""
+
+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 ""
+
+msgid "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+
+msgid "Downloading"
+msgstr "Download in corso"
+
+msgid "Select mode"
+msgstr "Modalità Selezione"
+
+msgid "Mapillary login"
+msgstr ""
+
+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 ""
+
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28933,9 +29440,6 @@ 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"
 
@@ -28968,9 +29472,6 @@ msgstr "Chat privata"
 msgid "Close tab"
 msgstr "Chiudi scheda"
 
-msgid "Logout"
-msgstr "Esci"
-
 msgid "Clear log"
 msgstr "Azzera registro"
 
@@ -29563,9 +30064,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29759,21 +30257,9 @@ msgstr "Immagini importate"
 msgid "Import vector graphics"
 msgstr "Importa immagini vettoriali"
 
-msgid "Scale:"
-msgstr "Scala:"
-
-msgid "unit(s) = "
-msgstr "unità = "
-
-msgid "Importing..."
-msgstr "Importazione in corso..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "File SVG [estensione ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Si prega di aprire o creare un livello dati prima dell''importazione"
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29989,6 +30475,61 @@ msgstr "Numero di {0}-ways junctions found: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "genera tutte le combinazioni dai candidati ad entrata/uscita"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Sostituisci dimensioni e posizione"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Indice di direzione ''{0}'' non trovato"
 
@@ -30250,400 +30791,6 @@ msgstr "Attiva l''estensione MapDust di resoconto bug"
 msgid "Missing input data"
 msgstr "Dati di ingresso mancanti"
 
-msgid "Mapillary Images"
-msgstr "Immagini Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Livelli Mapillary"
-
-msgid "Total images:"
-msgstr "Immagini totali:"
-
-msgid "images"
-msgstr "immagini"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Crea livello Mapillary"
-
-msgid "Start Mapillary layer"
-msgstr "Avvia livello 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 "Select pictures"
-msgstr "Seleziona foto"
-
-msgid "Import pictures into sequence"
-msgstr "Importa foto in sequenza"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importa foto in un livello Mapillary con una sequenza"
-
-msgid "Join mode"
-msgstr "modalità unisci"
-
-msgid "Join/unjoin pictures"
-msgstr "unisci/dividi foto"
-
-msgid "Join Mapillary pictures"
-msgstr "unisci foto Mapillary"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr "Carica foto"
-
-msgid "Upload Mapillary pictures"
-msgstr "Carica foto Mapillary"
-
-msgid "Upload pictures."
-msgstr "Carica foto."
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr "Ingrandisci l''immagine selezionata"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr "Sono state scaricate {0} immagini"
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr "Visualizza nel sito"
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr "Modifica nel sito"
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr "Invia"
-
-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 folder"
-msgstr "Selezionare una cartella"
-
-msgid "Explore"
-msgstr "Esplora"
-
-msgid "Select a directory"
-msgstr "Selezionare una cartella"
-
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 ""
-
-msgid "Download mode"
-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 "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 "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 ""
-
-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 ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-
-msgid "Downloading"
-msgstr "Download in corso"
-
-msgid "Select mode"
-msgstr "Modalità Selezione"
-
-msgid "Mapillary login"
-msgstr ""
-
-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 ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr "Nessuna immagine trovata"
-
-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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Valori misurati"
 
@@ -32207,6 +32354,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "spostato"
+
 msgid "rail"
 msgstr "terza rotaia"
 
@@ -32304,9 +32454,6 @@ msgstr "Cattura"
 msgid "Join"
 msgstr "Unisci"
 
-msgid "moved"
-msgstr "spostato"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Trasporto pubblico: Unisci fermate GTFS"
 
@@ -33381,6 +33528,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Case a schiera"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr "Da-rivedere"
 
@@ -33859,6 +34066,84 @@ msgstr "Scegliere una data di scadenza per la chiave:"
 msgid "Create a new signing key"
 msgstr "Crea una nuova chiave di firma"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Avanti"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Indietro"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Nessuna corsia."
 
@@ -34854,9 +35139,6 @@ msgstr "Trova primitive con queste etichette"
 msgid "Multitag Background: highlight"
 msgstr "Sfondo etichette multiple: in evidenza"
 
-msgid "Replace Geometry"
-msgstr "Sostituisci dimensioni e posizione"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Sostituisci oggetto selezionato con uno nuovo"
 
@@ -35076,15 +35358,9 @@ msgstr "Inizia/ferma la riproduzione video"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "Indietro"
-
 msgid "jumps n sec back"
 msgstr "salta n secondi indietro"
 
-msgid "Forward"
-msgstr "Avanti"
-
 msgid "jumps n sec forward"
 msgstr "salta n secondi avanti"
 
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 0abbe4e..6869555 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-09-02 06:28+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-09-27 05:38+0000\n"
 "Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
 "Language-Team: Japanese <tr at openstreetmap.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:06+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:53+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "X-Poedit-Country: JAPAN\n"
 "Language: ja\n"
 "X-Poedit-Language: Japanese\n"
@@ -209,18 +209,6 @@ msgstr "地図上の選択した要素を、上記リストの選択したアイ
 msgid "Add imagery layer {0}"
 msgstr "画像レイヤー {0} を追加"
 
-msgid "Error"
-msgstr "エラー"
-
-msgid "Select image format for WMS layer"
-msgstr "WMSレイヤーの画像形式を選択してください"
-
-msgid "Select WMS layers"
-msgstr "WMSレイヤーを選択"
-
-msgid "Add layers"
-msgstr "レイヤーを追加"
-
 msgid "Invalid service URL."
 msgstr "サービスURLが不正です。"
 
@@ -233,6 +221,18 @@ msgstr "WMSレイヤー一覧を参照できません。"
 msgid "Could not parse WMS layer list."
 msgstr "WMSレイヤー一覧を解釈できません。"
 
+msgid "Error"
+msgstr "エラー"
+
+msgid "Select image format for WMS layer"
+msgstr "WMSレイヤーの画像形式を選択してください"
+
+msgid "Select WMS layers"
+msgstr "WMSレイヤーを選択"
+
+msgid "Add layers"
+msgstr "レイヤーを追加"
+
 msgid "Add Node..."
 msgstr "ノードを追加..."
 
@@ -3310,9 +3310,6 @@ msgstr "マトリックス設定識別子"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "getCapabilities ドキュメントで定義されたレイヤーがありません: {0}"
 
-msgid "No layer selected"
-msgstr "レイヤーが選択されていません"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr "WMTS パーサエラー - 開始要素 {0} が終了要素 {2} の名前が異なります"
@@ -3712,12 +3709,12 @@ msgstr "通り名住居表示が重複している"
 msgid "House number without street"
 msgstr "通り名のない住居番号がある"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "住居番号''{0}''が重複しています"
-
 msgid "Duplicate house numbers"
 msgstr "住居番号が重複している"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "住居番号''{0}''が重複しています"
+
 msgid "Multiple street names in relation"
 msgstr "リレーションに複数の通り名がある"
 
@@ -3752,6 +3749,9 @@ msgstr "海岸線"
 msgid "This test checks that coastlines are correct."
 msgstr "このテストは海岸線が正しいことをチェックします。"
 
+msgid "Reversed coastline: land not on left side"
+msgstr "海岸線の反転: 陸地が左側にありません。"
+
 msgid "Unconnected coastline"
 msgstr "接続されていない海岸線"
 
@@ -3761,6 +3761,9 @@ msgstr "順序付いていない海岸線"
 msgid "Reversed coastline"
 msgstr "反転された海岸線"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "条件付きキー"
 
@@ -3797,6 +3800,12 @@ msgstr "交差している境界"
 msgid "Crossing barriers"
 msgstr "交差している柵"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4014,6 +4023,12 @@ msgstr "マルチポリゴンメンバのための有用なロールがない"
 msgid "Non-Way in multipolygon"
 msgstr "マルチポリゴン内にウェイ以外が含まれています"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "翻訳名(name:*)の不備"
 
@@ -4228,30 +4243,30 @@ msgstr "複数の空白文字が含まれたプロパティ値"
 msgid "Property values contain HTML entity"
 msgstr "HTML書式の値を持つプロパティ"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "''{0}'' キーは ''{1}'' ではないでしょうか。"
-
 msgid "Misspelled property key"
 msgstr "プロパティキーの綴り間違い"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "キー ''{0}'' はプリセットにはありません。"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "''{0}'' キーは ''{1}'' ではないでしょうか。"
 
 msgid "Presets do not contain property key"
 msgstr "プリセットに含まれていないプロパティキー"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "''{1}''キーの値''{0}''は''{2}''のようです。"
+msgid "Key ''{0}'' not in presets."
+msgstr "キー ''{0}'' はプリセットにはありません。"
 
 msgid "Misspelled property value"
 msgstr "プロパティ値のスペルミス"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "キー ''{1}'' の値 ''{0}'' はプリセットにはありません。"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "''{1}''キーの値''{0}''は''{2}''のようです。"
 
 msgid "Presets do not contain property value"
 msgstr "プリセットに含まれていないプロパティ値"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "キー ''{1}'' の値 ''{0}'' はプリセットにはありません。"
+
 msgid "FIXMES"
 msgstr "FIXME"
 
@@ -4495,9 +4510,6 @@ msgstr "順番が正しくないウェイ"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "このテストは水域、陸地および海岸線ウェイの方向をチェックします。"
 
-msgid "Reversed coastline: land not on left side"
-msgstr "海岸線の反転: 陸地が左側にありません。"
-
 msgid "Reversed land: land not on left side"
 msgstr "陸地の反転: 陸地は左側にない"
 
@@ -5019,9 +5031,6 @@ msgstr "マウスポインターの位置の経度です。"
 msgid "System of measurement changed to {0}"
 msgstr "単位系を{0}に変更しました"
 
-msgid "Layer not in list."
-msgstr "レイヤーがリストにありません。"
-
 msgid "Default (open, closed, new)"
 msgstr "既定 (開いている、閉じている、新規)"
 
@@ -6454,6 +6463,9 @@ msgstr "メモを並べ替え"
 msgid "Sort"
 msgstr "並べ替え"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "オブジェクト種別:"
 
@@ -6694,6 +6706,14 @@ msgstr "変更セットの内容をダウンロード"
 msgid "Download the content of the selected changesets from the server"
 msgstr "選択した変更セットの内容をサーバーからダウンロード"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "自分の変更分"
 
@@ -7983,9 +8003,6 @@ msgstr "検索する場所の名前を入力"
 msgid "Areas around places"
 msgstr "地名"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
-
 msgid "Search ..."
 msgstr "検索 ..."
 
@@ -8574,6 +8591,9 @@ msgstr "保存されていない変更があります - 終了前に保存/ア
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "未保存の変更 - 削除前に保存/アップロードしますか?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "修正されたレイヤーをアップロード、保存中 ..."
 
@@ -8628,6 +8648,12 @@ msgstr "直ちに終了!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "保存せずにJOSMを終了"
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "直ちに削除"
 
@@ -8640,6 +8666,12 @@ msgstr "終了の前に動作を実行"
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr "保存せずにJOSMを終了。未保存の変更はアップロード、保存されます。"
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "削除前に動作を実行"
 
@@ -10767,6 +10799,9 @@ msgstr "一方通行の向きを矢印で表示"
 msgid "Draw segment order numbers"
 msgstr "区間の順序番号を表示する"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を表示"
 
@@ -12889,6 +12924,9 @@ msgstr "NMEAのインポートに成功しました:"
 msgid "NMEA import failure!"
 msgstr "NMEAのインポートに失敗しました。"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
+
 msgid "Note Files"
 msgstr "メモファイル"
 
@@ -13254,6 +13292,9 @@ msgstr "データアップロード中 ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "osmプリミティブに予期しないID 0が見つかりました"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "データのダウンロード中..."
 
@@ -14958,6 +14999,9 @@ msgstr "Tiris: DGM (Terrain model)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Surface model)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -15069,8 +15113,11 @@ msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -15250,6 +15297,9 @@ msgstr "Drone Imagery 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drone Imagery Canaan(Haiti) November 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortophoto 2000"
 
@@ -15544,18 +15594,6 @@ msgstr "Freemap.sk Cyclo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Ski"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakia Historic Maps"
 
@@ -15565,6 +15603,9 @@ msgstr "RABA-KGZ: Slovenia farmland use"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slovenia built-up areas"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
@@ -15697,6 +15738,9 @@ msgstr "U.S. Forest Service roads"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -16075,6 +16119,9 @@ msgstr "このプラグインは現在アクティブなJOSMレイヤーのGPS
 msgid "Downloads OSM data along a way"
 msgstr "ウェイに沿ってOSMデータをダウンロードします"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16202,6 +16249,9 @@ msgid ""
 msgstr ""
 "チャネル方向グラフを作成し、それが交差点であればチャネルがその一部であるかどうかをチェックしたり、交差点の中でチャネルの一部を検索したりします"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "WMS イメージのベクトル化を支援する"
 
@@ -16408,6 +16458,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "1つのブロックからテラスハウスを作成する"
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16431,6 +16486,9 @@ msgstr "地図から建物やその他のシェイプをトレースします。
 msgid "Plugin to digital sign OSM-Data"
 msgstr "OSMデータに電子署名をするプラグイン"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr "右左折車線の追加、編集、削除に直観的なGUIを提供します。"
@@ -16593,6 +16651,10 @@ msgid "No wheeled vehicle"
 msgstr "車輪付きの車両では不可"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "競技場"
 
@@ -16691,7 +16753,7 @@ msgid "Service type"
 msgstr "線路の種別"
 
 msgid "yard"
-msgstr "車両基地"
+msgstr "操車場"
 
 msgid "siding"
 msgstr "側線"
@@ -17913,6 +17975,9 @@ msgstr "建設中"
 msgid "Ford"
 msgstr "浅瀬(洗い越し)"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "ウェイ"
 
@@ -19534,6 +19599,9 @@ msgstr "滑走路"
 msgid "Taxiway"
 msgstr "誘導路"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "ヘリパッド"
 
@@ -20204,11 +20272,11 @@ msgstr "ポイント数"
 msgid "Point Name"
 msgstr "ポイント名"
 
-msgid "Phone Number"
-msgstr "電話番号"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "動物病院"
@@ -20222,6 +20290,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr "AED(自動体外式除細動器)"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "電話番号"
+
 msgid "Located inside a building?"
 msgstr "建物内"
 
@@ -21091,6 +21165,10 @@ msgid "university"
 msgstr "大学"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "病院"
 
@@ -21175,6 +21253,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "階数"
 
@@ -23380,8 +23462,14 @@ msgstr "自然保護区"
 msgid "Scree"
 msgstr "ガレ場"
 
-msgid "An accumulation of loose rocks."
-msgstr "大きい岩が堆積した場所です。"
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "高原"
@@ -24048,17 +24136,11 @@ msgstr "ルート"
 msgid "Bicycle Route"
 msgstr "自転車ルート"
 
-msgid "icn"
-msgstr "国際自転車道"
-
-msgid "ncn"
-msgstr "国立自転車道"
-
-msgid "rcn"
-msgstr "地方自転車道"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "地域自転車道"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "マウンテンバイクルート"
@@ -24066,18 +24148,6 @@ msgstr "マウンテンバイクルート"
 msgid "Hiking Route"
 msgstr "ハイキングルート"
 
-msgid "iwn"
-msgstr "国際歩道"
-
-msgid "nwn"
-msgstr "国立歩道"
-
-msgid "rwn"
-msgstr "地方歩道"
-
-msgid "lwn"
-msgstr "地域歩道"
-
 msgid "infrastructure"
 msgstr "インフラ"
 
@@ -24090,18 +24160,6 @@ msgstr "ウォーキングルート"
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr "スキールート"
 
@@ -24294,9 +24352,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr "{0}があるのに{1}がない"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0}があるのに{1}または{2}がない"
 
@@ -24306,6 +24375,12 @@ msgstr "{1}や{2}や{3}がない{0}"
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24321,39 +24396,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr "{0}が疑わしいオブジェクト上にある"
 
-msgid "restaurant without name"
-msgstr "名前がないレストラン"
-
-msgid "{0} used with {1}"
-msgstr "{0}が{1}と一緒に使われている"
-
 msgid "natural water used for swimming pool"
 msgstr "natural=water が水泳プールに使われている"
 
 msgid "sport without physical feature"
 msgstr "スポーツに物理的な地物が設定されていない"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0}は{1}と{2}が交差するノード上にあるべきです"
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24372,9 +24432,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0}は推奨されていません"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr "''{0}''は意味がありません。''{1}''などのもっと具体的なタグを使用してください"
 
@@ -24429,10 +24498,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24448,7 +24523,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24493,8 +24568,8 @@ msgstr "同じ自然領域が重複している"
 msgid "Overlapping Identical Landuses"
 msgstr "同じ土地利用が重複している"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} はウェイに接続している必要があります"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr ""
@@ -24527,6 +24602,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0}は{1}と{2}が交差するノード上にあるべきです"
+
 msgid "abbreviated street name"
 msgstr "通り名が略称になっている"
 
@@ -24545,6 +24623,9 @@ msgstr "参照記号のない道路"
 msgid "temporary highway type"
 msgstr "道路の種別が未確定"
 
+msgid "{0} used with {1}"
+msgstr "{0}が{1}と一緒に使われている"
+
 msgid "street name contains ss"
 msgstr "ssが含まれている通り名"
 
@@ -24635,11 +24716,14 @@ msgstr "不明なユダヤ教の宗派"
 msgid "{0} is unnecessary"
 msgstr "{0}は不要"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0}は{1}には不要です"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1}は意味がありません"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "親ウェイのタグが重複しているノード"
@@ -24887,6 +24971,27 @@ msgstr "GPXトラックのアップロード"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "openstreetmap.org へトレースをアップロード"
 
+msgid "Importing..."
+msgstr "インポート中..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "インポート前にデータレイヤーを開くか新規作成するかしてください"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "スケール:"
+
+msgid "unit(s) = "
+msgstr "単位= "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "高度プロファイルを表示"
 
@@ -25232,6 +25337,403 @@ msgstr "下絵となるイメージをインポートします"
 msgid "Error while creating image layer: "
 msgstr "イメージレイヤーを作成中にエラー: "
 
+msgid "Mapillary Images"
+msgstr ""
+
+msgid "Mapillary layer"
+msgstr ""
+
+msgid "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr ""
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr "ログイン"
+
+msgid "Logout"
+msgstr "ログアウト"
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -27007,9 +27509,6 @@ msgstr "GeoChatパネルを開く"
 msgid "Zoom in to see messages"
 msgstr "メッセージを見るためにズームイン"
 
-msgid "Login"
-msgstr "ログイン"
-
 msgid "Enable autologin"
 msgstr "自動ログインを有効化"
 
@@ -27041,9 +27540,6 @@ msgstr "プライベートチャット"
 msgid "Close tab"
 msgstr "タブを閉じる"
 
-msgid "Logout"
-msgstr "ログアウト"
-
 msgid "Clear log"
 msgstr "ログのクリア"
 
@@ -27605,9 +28101,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -27786,21 +28279,9 @@ msgstr "インポートした画像"
 msgid "Import vector graphics"
 msgstr "ベクターグラフィックスをインポート"
 
-msgid "Scale:"
-msgstr "スケール:"
-
-msgid "unit(s) = "
-msgstr "単位= "
-
-msgid "Importing..."
-msgstr "インポート中..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVGファイル[ImportVecプラグイン](*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "インポート前にデータレイヤーを開くか新規作成するかしてください"
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -28009,6 +28490,61 @@ msgstr "{0}方向の交差点が見つかった数: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "入口/出口の候補の組み合わせをすべて作成"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "位置を置き換え"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "方向のインデックス ''{0}'' が見つかりませんでした"
 
@@ -28252,400 +28788,6 @@ msgstr "MapDustバグ報告プラグインを有効化"
 msgid "Missing input data"
 msgstr "入力データがありません"
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "測定した値"
 
@@ -30122,6 +30264,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "移動"
+
 msgid "rail"
 msgstr "第三軌条"
 
@@ -30217,9 +30362,6 @@ msgstr "キャッチ"
 msgid "Join"
 msgstr "統合"
 
-msgid "moved"
-msgstr "移動"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "公共交通: GTFSの停留所を追加"
 
@@ -31243,6 +31385,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "テラスハウス"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31705,6 +31907,84 @@ msgstr "キーの有効期限を選択:"
 msgid "Create a new signing key"
 msgstr "新しい署名キーを選択"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "進む"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "戻る"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "そのような車線はありません。"
 
@@ -32586,9 +32866,6 @@ msgstr "これらのタグのプリミティブを検索"
 msgid "Multitag Background: highlight"
 msgstr "複数タグの背景: 強調"
 
-msgid "Replace Geometry"
-msgstr "位置を置き換え"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "選択されたオブジェクトの位置を新しいものに置き換え"
 
@@ -32783,15 +33060,9 @@ msgstr "ビデオ再生を開始/停止"
 msgid "Video: {0}"
 msgstr "ビデオ: {0}"
 
-msgid "Backward"
-msgstr "戻る"
-
 msgid "jumps n sec back"
 msgstr "n 秒前にジャンプ"
 
-msgid "Forward"
-msgstr "進む"
-
 msgid "jumps n sec forward"
 msgstr "n 秒先にジャンプ"
 
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 3117787..f0f6c62 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:53+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:44+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ka\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -206,28 +206,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "შეცდომა"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "შეცდომა"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3283,9 +3283,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3687,10 +3684,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3727,6 +3724,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3736,6 +3736,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3772,6 +3775,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3990,6 +3999,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4200,30 +4215,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4467,9 +4482,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4990,9 +5002,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6412,6 +6421,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "ობიექტის ტიპი:"
 
@@ -6651,6 +6663,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7923,9 +7943,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8489,6 +8506,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8540,6 +8560,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8552,6 +8578,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10605,6 +10637,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12686,6 +12721,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13048,6 +13086,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14691,6 +14732,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14802,7 +14846,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14981,6 +15028,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15275,18 +15325,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15296,6 +15334,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15428,6 +15469,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15795,6 +15839,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15909,6 +15956,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16106,6 +16156,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16128,6 +16183,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16284,6 +16342,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17604,6 +17666,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19223,6 +19288,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19893,10 +19961,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19911,6 +19979,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20780,6 +20854,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20864,6 +20942,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23069,7 +23151,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23736,16 +23824,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23754,18 +23836,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23778,18 +23848,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23982,9 +24040,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23994,6 +24063,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24009,39 +24084,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24060,9 +24120,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24117,10 +24186,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24136,7 +24211,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24181,7 +24256,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24215,6 +24290,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24233,6 +24311,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24323,10 +24404,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24572,6 +24656,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24910,3267 +25015,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29632,6 +29774,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29727,9 +29872,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30741,6 +30883,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31188,6 +31390,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32014,9 +32294,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32210,15 +32487,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 053f90e..1b9c6d0 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:07+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:53+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -210,18 +210,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "បន្ថែម​ស្រទាប់​រូបភាព {0}"
 
-msgid "Error"
-msgstr "កំហុស"
-
-msgid "Select image format for WMS layer"
-msgstr "ជ្រើស​ទ្រង់ទ្រាយ​រូបភាព​សម្រាប់​ស្រទាប់ WMS"
-
-msgid "Select WMS layers"
-msgstr "ជ្រើស​ស្រទាប់ WMS"
-
-msgid "Add layers"
-msgstr "បន្ថែម​ស្រទាប់"
-
 msgid "Invalid service URL."
 msgstr "សេវាកម្ម URL មិន​ត្រឹមត្រូវ។"
 
@@ -234,6 +222,18 @@ msgstr "មិន​អាច​ទៅ​យក​បញ្ជី​ស្រទ
 msgid "Could not parse WMS layer list."
 msgstr "មិន​អាច​ញែក​បញ្ជី​ស្រទាប់ WMS ។"
 
+msgid "Error"
+msgstr "កំហុស"
+
+msgid "Select image format for WMS layer"
+msgstr "ជ្រើស​ទ្រង់ទ្រាយ​រូបភាព​សម្រាប់​ស្រទាប់ WMS"
+
+msgid "Select WMS layers"
+msgstr "ជ្រើស​ស្រទាប់ WMS"
+
+msgid "Add layers"
+msgstr "បន្ថែម​ស្រទាប់"
+
 msgid "Add Node..."
 msgstr "បន្ថែម​តំណ​..."
 
@@ -3476,9 +3476,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3912,12 +3909,12 @@ msgstr "ទំនាក់ទំនង​ផ្លូវ​ពាក់ព័ន
 msgid "House number without street"
 msgstr "លេខ​ផ្ទះ​ដោយ​គ្មាន​ផ្លូវ"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "លេខ​ផ្ទះ ''{0}'' ស្ទួន​គ្នា"
-
 msgid "Duplicate house numbers"
 msgstr "លេខ​ផ្ទះ​ស្ទួន​គ្នា"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "លេខ​ផ្ទះ ''{0}'' ស្ទួន​គ្នា"
+
 msgid "Multiple street names in relation"
 msgstr "ឈ្មោះ​ផ្លូវ​ច្រើន​ក្នុង​ទំនាក់ទំនង"
 
@@ -3954,6 +3951,9 @@ msgstr "ច្រាំង​សមុទ្រ"
 msgid "This test checks that coastlines are correct."
 msgstr "ការ​សាកល្បង​នេះ​ពិនិត្យមើល​ជួរ​មាត់​ច្រាំង​សមុទ្រ​ឲ្យ​ត្រឹមត្រូវ។"
 
+msgid "Reversed coastline: land not on left side"
+msgstr "ជួរ​មាត់ច្រាំង​សមុទ្រ​បញ្ច្រាស៖ ដី​មិន​នៅ​លើ​ផ្នែក​ខាងឆ្វេង"
+
 msgid "Unconnected coastline"
 msgstr "ជួរ​មាត់ច្រាំង​សមុទ្រ​ដែល​មិនបាន​តភ្ជាប់"
 
@@ -3963,6 +3963,9 @@ msgstr "ជួរ​មាត់ច្រាំង​សមុទ្រ​ដែ
 msgid "Reversed coastline"
 msgstr "ជួរ​មាត់ច្រាំង​សមុទ្រ​ដែល​បាន​បញ្ច្រាស"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "កូនសោ​លក្ខខណ្ឌ"
 
@@ -3999,6 +4002,12 @@ msgstr "ផ្លូវ​កាត់​ព្រំដែន"
 msgid "Crossing barriers"
 msgstr "ផ្លូវ​ឆ្លងកាត់​របាំង"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4225,6 +4234,12 @@ msgstr "មិន​មាន​តួនាទី​ចាំបាច់​ស
 msgid "Non-Way in multipolygon"
 msgstr "មិន​មាន​ផ្លូវ​នៅ​ក្នុង​ពហុកោណ​ចម្រុះ"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "បាត់​ការ​បកប្រែ name:*"
 
@@ -4450,31 +4465,31 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "តម្លៃ​លក្ខណសម្បត្តិ​មាន​ធាត HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
-msgstr "ពាក្យ​គន្លឹះ ''{0}'' គឺ​មិន​នៅ​ក្នុង​ការ​កំណត់​ស្រេច"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr "ការ​កំណត់​ស្រេច​មិន​មាន​ពាក្យ​គន្លឹះ​លក្ខណសម្បត្តិ"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr ""
+msgid "Key ''{0}'' not in presets."
+msgstr "ពាក្យ​គន្លឹះ ''{0}'' គឺ​មិន​នៅ​ក្នុង​ការ​កំណត់​ស្រេច"
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
-"តម្លៃ ''{0}'' សម្រាប់​ពាក្យ​គន្លឹះ ''{1}'' មិន​នៅ​ក្នុង​ការ​កំណត់​ស្រេច។"
 
 msgid "Presets do not contain property value"
 msgstr "ការ​កំណត់​ស្រេច​មិន​មាន​តម្លៃ​លក្ខណសម្បត្តិ"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+"តម្លៃ ''{0}'' សម្រាប់​ពាក្យ​គន្លឹះ ''{1}'' មិន​នៅ​ក្នុង​ការ​កំណត់​ស្រេច។"
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4730,9 +4745,6 @@ msgstr ""
 "វា​នឹង​ពិនិត្យមើល​ទិស​របស់​ផ្លូវ​ទឹក ផ្លូវ​ដី "
 "និង​ផ្លូវ​ជួរ​មាត់ច្រាំង​សមុទ្រ។"
 
-msgid "Reversed coastline: land not on left side"
-msgstr "ជួរ​មាត់ច្រាំង​សមុទ្រ​បញ្ច្រាស៖ ដី​មិន​នៅ​លើ​ផ្នែក​ខាងឆ្វេង"
-
 msgid "Reversed land: land not on left side"
 msgstr "ដី​បញ្ច្រាស៖ ដី​មិន​នៅ​លើ​ផ្នែក​ខាងឆ្វេង"
 
@@ -5274,9 +5286,6 @@ msgstr "រយៈបណ្ដោយ​ភូមិសាស្ត្រ​នៅ
 msgid "System of measurement changed to {0}"
 msgstr "បាន​ប្ដូរ​រង្វាស់​ប្រព័ន្ធ​ទៅ {0}"
 
-msgid "Layer not in list."
-msgstr "ស្រទាប់​មិន​នៅ​ក្នុង​បញ្ជី។"
-
 msgid "Default (open, closed, new)"
 msgstr "លំនាំដើម (បើក បិទ ថ្មី)"
 
@@ -6800,6 +6809,9 @@ msgstr "តម្រៀប​ចំណាំ"
 msgid "Sort"
 msgstr "តម្រៀប"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "ប្រភេទ​វត្ថុ៖"
 
@@ -7048,6 +7060,14 @@ msgstr "ទាញ​យក​មាតិកា​សំណុំ​ផ្លា
 msgid "Download the content of the selected changesets from the server"
 msgstr "ទាញ​យក​មាតិកា​សំណុំ​ផ្លាស់ប្ដូរ​ដែល​បា​នជ្រើស​ចេញពី​ម៉ាស៊ីន​មេ"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "សំណុំ​ផ្លាស់ប្ដូរ​របស់​ខ្ញុំ"
 
@@ -8434,9 +8454,6 @@ msgstr "បញ្ចូល​ឈ្មោះ​កន្លែង​ដើម្
 msgid "Areas around places"
 msgstr "តំបន់​ជុំវិញ​ទីកន្លែង"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "ការ​លើកលែង​ចំណុច​ចង្អុល​សូន្យ អាច​បាត់​ស្លាក​ខ្លះ។"
-
 msgid "Search ..."
 msgstr "ស្វែងរក..."
 
@@ -9084,6 +9101,9 @@ msgstr "ការ​ផ្លាស់ប្ដូរ​ដែល​មិន​
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "ការ​ផ្លាស់ប្ដូរ​ដែល​មិន​រក្សាទុក - រក្សាទុក/ផ្ទុក​ឡើង​មុន​ពេល​លុប?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "កំពុង​ផ្ទុក​ឡើង និង​រក្សាទុក​ស្រទាប់​ដែល​បាន​កែ..."
 
@@ -9144,6 +9164,12 @@ msgstr ""
 "បិទ JOSM ដោយ​មិន​រក្សាទុក។ ការ​ផ្លាស់ប្ដូរ​ដែល​មិន​បាន​រក្សាទុក "
 "នឹង​ត្រូវ​បាត់។"
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "លុប​ឥឡូវ!"
 
@@ -9160,6 +9186,12 @@ msgstr ""
 "បិទ JOSM ដោយ​មិន​រក្សាទុក។ ការ​ផ្លាស់ប្ដូរ​ដែល​មិន​បាន​រក្សាទុក "
 "នឹង​ត្រូវ​បាន​ផ្ទុក​ឡើង និង/ឬ​រក្សាទុក។"
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "អនុវត្ត​សកម្មភាព​មុន​ពេល​លុប"
 
@@ -11459,6 +11491,9 @@ msgstr "គូរ​ព្រួញ​ផ្លូវ​មួយ​ទិស។
 msgid "Draw segment order numbers"
 msgstr "គូរ​លេខ​លំដាប់​កំណាត់"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "គូរ​ព្រំដែន​ទិន្នន័យ​ដែល​បាន​ទាញ​យក"
 
@@ -13753,6 +13788,9 @@ msgstr "នាំចូល NMEA ដោយ​ជោគជ័យ៖"
 msgid "NMEA import failure!"
 msgstr "ការ​នាំចូល NMEA បាន​បរាជ័យ!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "ការ​លើកលែង​ចំណុច​ចង្អុល​សូន្យ អាច​បាត់​ស្លាក​ខ្លះ។"
+
 msgid "Note Files"
 msgstr "ឯកសារ​ចំណាំ"
 
@@ -14159,6 +14197,9 @@ msgstr "កំពុង​ផ្ទុក​ទិន្នន័យ​ឡើង
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "បាន​រក​ឃើញ​លេខ​សម្គាល់ 0 មិន​រំពឹង​ទុក​សម្រាប់​ព្រីមីទីវ osm"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -16020,6 +16061,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -16131,7 +16175,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -16310,6 +16357,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16604,18 +16654,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -16625,6 +16663,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -16757,6 +16798,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -17152,6 +17196,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "ទាញ​យក​ទិន្នន័យ OSM តាម​ផ្លូវ"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17294,6 +17341,9 @@ msgstr ""
 "បើ​វា​ជា​ចំណុច​ប្រសព្វ "
 "ឬ​ស្វែងរក​នៅ​ក្នុង​សំណុំ​រង​របស់​ឆានែល​សម្រាប់​ចំណុច​ប្រសព្វ"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "ជំនួយ​ការ​បង្កើត​វ៉ិចទ័រ​រូបភាព WMS ។"
 
@@ -17523,6 +17573,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17545,6 +17600,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17701,6 +17759,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -19021,6 +19083,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -20640,6 +20705,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -21310,10 +21378,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -21328,6 +21396,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -22197,6 +22271,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -22281,6 +22359,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -24486,7 +24568,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -25153,16 +25241,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -25171,18 +25253,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -25195,18 +25265,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -25399,9 +25457,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -25411,6 +25480,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -25426,39 +25501,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25477,9 +25537,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -25534,10 +25603,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -25553,7 +25628,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25598,7 +25673,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -25632,6 +25707,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -25650,6 +25728,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -25740,10 +25821,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -25989,6 +26073,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -26327,6 +26432,403 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
+msgid "Mapillary Images"
+msgstr ""
+
+msgid "Mapillary layer"
+msgstr ""
+
+msgid "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr ""
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr ""
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr ""
 
@@ -27979,9 +28481,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Login"
-msgstr ""
-
 msgid "Enable autologin"
 msgstr ""
 
@@ -28014,9 +28513,6 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Logout"
-msgstr ""
-
 msgid "Clear log"
 msgstr ""
 
@@ -28562,9 +29058,6 @@ msgstr ""
 msgid "cm"
 msgstr ""
 
-msgid "m"
-msgstr ""
-
 msgid "km"
 msgstr ""
 
@@ -28734,21 +29227,9 @@ msgstr ""
 msgid "Import vector graphics"
 msgstr ""
 
-msgid "Scale:"
-msgstr ""
-
-msgid "unit(s) = "
-msgstr ""
-
-msgid "Importing..."
-msgstr ""
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -28953,6 +29434,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr ""
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -29196,400 +29732,6 @@ msgstr ""
 msgid "Missing input data"
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr ""
 
@@ -31049,6 +31191,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -31144,9 +31289,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -32158,6 +32300,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -32605,6 +32807,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "ទៅ​មុខ"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -33431,9 +33711,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -33627,15 +33904,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "ទៅ​មុខ"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index 4dd66bd..e247511 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: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2016-08-05 12:36+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: 2016-09-06 05:08+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:54+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ko\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -203,18 +203,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "영상 레이어 {0} 추가"
 
-msgid "Error"
-msgstr "오류"
-
-msgid "Select image format for WMS layer"
-msgstr "WMS 레이어에 대한 그림 형식 선택"
-
-msgid "Select WMS layers"
-msgstr "WMS 레이어 선택"
-
-msgid "Add layers"
-msgstr "레이어 추가"
-
 msgid "Invalid service URL."
 msgstr "올바르지 않은 서비스 URL"
 
@@ -227,6 +215,18 @@ msgstr "WMS 레이어 목록을 얻을 수 없습니다."
 msgid "Could not parse WMS layer list."
 msgstr "WMS 레이어 목록을 구문 분석할 수 없었습니다."
 
+msgid "Error"
+msgstr "오류"
+
+msgid "Select image format for WMS layer"
+msgstr "WMS 레이어에 대한 그림 형식 선택"
+
+msgid "Select WMS layers"
+msgstr "WMS 레이어 선택"
+
+msgid "Add layers"
+msgstr "레이어 추가"
+
 msgid "Add Node..."
 msgstr "노드 추가..."
 
@@ -3264,9 +3264,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3666,10 +3663,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3706,6 +3703,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3715,6 +3715,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3751,6 +3754,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3969,6 +3978,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4179,30 +4194,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4446,9 +4461,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4968,9 +4980,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6388,6 +6397,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "오브젝트 형식:"
 
@@ -6627,6 +6639,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7899,9 +7919,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8470,6 +8487,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8521,6 +8541,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8533,6 +8559,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10586,6 +10618,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12667,6 +12702,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13029,6 +13067,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14672,6 +14713,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14783,7 +14827,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14962,6 +15009,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15256,18 +15306,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15277,6 +15315,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15409,6 +15450,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15776,6 +15820,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15890,6 +15937,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16087,6 +16137,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16109,6 +16164,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16265,6 +16323,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17585,6 +17647,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19204,6 +19269,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19874,10 +19942,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19892,6 +19960,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20761,6 +20835,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20845,6 +20923,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23050,7 +23132,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23717,16 +23805,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23735,18 +23817,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23759,18 +23829,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23963,9 +24021,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23975,6 +24044,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -23990,39 +24065,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24041,9 +24101,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24098,10 +24167,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24117,7 +24192,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24162,7 +24237,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24196,6 +24271,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24214,6 +24292,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24304,10 +24385,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24553,6 +24637,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24891,3267 +24996,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
-msgstr "시계를 12시간 모드로 표시합니다."
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
-msgstr ""
+msgid "Display clock in 12h mode."
+msgstr "시계를 12시간 모드로 표시합니다."
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29613,6 +29755,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29708,9 +29853,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30722,6 +30864,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31169,6 +31371,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "앞으로"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -31994,9 +32274,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32190,15 +32467,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "앞으로"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index bb08b47..edf484e 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:07+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:54+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -203,28 +203,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Ката"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Ката"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3277,9 +3277,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3681,10 +3678,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3721,6 +3718,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3730,6 +3730,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3766,6 +3769,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3984,6 +3993,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4194,30 +4209,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4461,9 +4476,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4984,9 +4996,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6406,6 +6415,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6645,6 +6657,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7917,9 +7937,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8483,6 +8500,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8534,6 +8554,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8546,6 +8572,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10599,6 +10631,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12680,6 +12715,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13042,6 +13080,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14685,6 +14726,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14796,7 +14840,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14975,6 +15022,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15269,18 +15319,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15290,6 +15328,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15422,6 +15463,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15789,6 +15833,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15903,6 +15950,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16100,6 +16150,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16122,6 +16177,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16278,6 +16336,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17598,6 +17660,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19217,6 +19282,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19887,10 +19955,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19905,6 +19973,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20774,6 +20848,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20858,6 +20936,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23063,7 +23145,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23730,16 +23818,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23748,18 +23830,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23772,18 +23842,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23976,9 +24034,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23988,6 +24057,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24003,39 +24078,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24054,9 +24114,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24111,10 +24180,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24130,7 +24205,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24175,7 +24250,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24209,6 +24284,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24227,6 +24305,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24317,10 +24398,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24566,6 +24650,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24904,3267 +25009,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29626,6 +29768,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29721,9 +29866,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30735,6 +30877,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31182,6 +31384,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32008,9 +32288,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32204,15 +32481,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/lb.po b/i18n/po/lb.po
index 235d149..5656f18 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: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:12+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:57+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr "{0}:D''Optioun \"{1}\" ass net eendeiteg"
@@ -203,28 +203,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3277,9 +3277,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3681,10 +3678,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3721,6 +3718,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3730,6 +3730,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3766,6 +3769,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3984,6 +3993,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4194,30 +4209,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4461,9 +4476,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4984,9 +4996,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6406,6 +6415,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6645,6 +6657,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7917,9 +7937,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8483,6 +8500,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8534,6 +8554,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8546,6 +8572,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10599,6 +10631,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12680,6 +12715,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13042,6 +13080,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14685,6 +14726,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14796,7 +14840,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14975,6 +15022,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15269,18 +15319,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15290,6 +15328,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15422,6 +15463,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15789,6 +15833,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15903,6 +15950,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16100,6 +16150,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16122,6 +16177,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16278,6 +16336,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17598,6 +17660,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19217,6 +19282,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19887,10 +19955,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19905,6 +19973,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20774,6 +20848,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20858,6 +20936,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23063,7 +23145,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23730,16 +23818,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23748,18 +23830,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23772,18 +23842,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23976,9 +24034,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23988,6 +24057,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24003,39 +24078,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24054,9 +24114,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24111,10 +24180,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24130,7 +24205,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24175,7 +24250,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24209,6 +24284,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24227,6 +24305,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24317,10 +24398,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24566,6 +24650,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24904,3267 +25009,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29626,6 +29768,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29721,9 +29866,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30735,6 +30877,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31182,6 +31384,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32008,9 +32288,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32204,15 +32481,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index 7c6658b..153c39b 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:09+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:55+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "ບັນຫາໃນການປະຕິບັດ"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "ບັນຫາໃນການປະຕິບັດ"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index b526c68..7f7e025 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-17 19:20+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-09-13 19:41+0000\n"
 "Last-Translator: Aurimas Fišeras <Unknown>\n"
 "Language-Team: Lithuanian <lt at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:11+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:56+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: lt\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -216,18 +216,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Pridėti vaizdų sluoksnį {0}"
 
-msgid "Error"
-msgstr "Klaida"
-
-msgid "Select image format for WMS layer"
-msgstr "Parinkite WMS sluoksnio piešinio formatą"
-
-msgid "Select WMS layers"
-msgstr "Parinkite WMS sluoksnius"
-
-msgid "Add layers"
-msgstr "Pridėti sluoksnius"
-
 msgid "Invalid service URL."
 msgstr "Netinkamas šaltinio URL"
 
@@ -240,6 +228,18 @@ msgstr "Nepavyko gauti WMS sluoksnių sąrašo."
 msgid "Could not parse WMS layer list."
 msgstr "Nepavyko išnagrinėti WMS sluoksnių sąrašo."
 
+msgid "Error"
+msgstr "Klaida"
+
+msgid "Select image format for WMS layer"
+msgstr "Parinkite WMS sluoksnio piešinio formatą"
+
+msgid "Select WMS layers"
+msgstr "Parinkite WMS sluoksnius"
+
+msgid "Add layers"
+msgstr "Pridėti sluoksnius"
+
 msgid "Add Node..."
 msgstr "Pridėti tašką..."
 
@@ -493,10 +493,10 @@ msgid "Download notes in current view"
 msgstr "Atsiųsti pastabas dabartiniame rodinyje"
 
 msgid "Download in current view"
-msgstr ""
+msgstr "Atsiųsti dabartiniame rodinyje"
 
 msgid "Download map data from the OSM server in current view"
-msgstr ""
+msgstr "Atsiųsti dabartinio rodinio žemėlapio duomenis iš OSM serverio"
 
 msgid "Download object..."
 msgstr "Parsiųsti objektą..."
@@ -1902,7 +1902,7 @@ msgid "Errors during download"
 msgstr "Klaidos atsiuntimo metu"
 
 msgid "Download Geo URL"
-msgstr ""
+msgstr "Atsiųsti Geo URL"
 
 msgid "Download GPS"
 msgstr "Atsiųsti GPS"
@@ -3589,9 +3589,6 @@ msgstr "Matricos rinkinio identifikatorius"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Jokie sluoksniai nebuvo apibrėžti getCapabilities dokumento: {0}"
 
-msgid "No layer selected"
-msgstr "Neparinktas joks sluoksnis"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4023,12 +4020,12 @@ msgstr "Keli associatedStreet ryšiai"
 msgid "House number without street"
 msgstr "Namo numeris be gatvės"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Namo numerio „{0}“ dublis"
-
 msgid "Duplicate house numbers"
 msgstr "Dubliuoti namo numeriai"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Namo numerio „{0}“ dublis"
+
 msgid "Multiple street names in relation"
 msgstr "Kely gatvių pavadinimai ryšyje"
 
@@ -4064,6 +4061,9 @@ msgstr "Kranto linijos"
 msgid "This test checks that coastlines are correct."
 msgstr "Šis testas tikrina, ar teisingos kranto linijos."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Atbulas krantas: žemė ne kairėje pusėje"
+
 msgid "Unconnected coastline"
 msgstr "Neprijungta kranto linija"
 
@@ -4073,6 +4073,9 @@ msgstr "Nesurikiuota kranto linija"
 msgid "Reversed coastline"
 msgstr "Atbula kranto linija"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "Sąlyginiai raktai"
 
@@ -4109,6 +4112,12 @@ msgstr "Susikertančios ribos"
 msgid "Crossing barriers"
 msgstr "Susikertantys barjerai"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4341,6 +4350,12 @@ msgstr "Nėra naudingos multipoligono nario rolės"
 msgid "Non-Way in multipolygon"
 msgstr "Ne kelias multipoligone"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Trūksta name:* vertimo"
 
@@ -4563,30 +4578,30 @@ msgstr "Savybės vertės turi daug baltų plotų"
 msgid "Property values contain HTML entity"
 msgstr "Savybės reikšmėje yra HTML esybė"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Raktas ''{0}'' atrodo kaip ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Klaidingai parašytas savybės raktas"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Rakto „{0}“ nėra ruošiniuose."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Raktas ''{0}'' atrodo kaip ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Išankstiniuose rinkiniuose nėra savybės rakto"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Vertė ''{0}'' raktui ''{1}'' atrodo kaip ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Rakto „{0}“ nėra ruošiniuose."
 
 msgid "Misspelled property value"
 msgstr "Klaidingai užrašyta nuosavybės reikšme"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Rakto „{1}“ reikšmės „{0}“ nėra ruošiniuose."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Vertė ''{0}'' raktui ''{1}'' atrodo kaip ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Ruošiniuose nėra savybės reikšmės"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Rakto „{1}“ reikšmės „{0}“ nėra ruošiniuose."
+
 msgid "FIXMES"
 msgstr "PATAISYKMANE"
 
@@ -4832,9 +4847,6 @@ msgstr "Blogai surikiuoti keliai"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Šis testas tikrina vandens, žemės ir kranto kelių kryptį."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Atbulas krantas: žemė ne kairėje pusėje"
-
 msgid "Reversed land: land not on left side"
 msgstr "Atbula žemė: žemė ne kairėje pusėje"
 
@@ -5391,9 +5403,6 @@ msgstr "Pelės žymeklio geografinė ilguma"
 msgid "System of measurement changed to {0}"
 msgstr "Matavimo sistema pakeista į {0}"
 
-msgid "Layer not in list."
-msgstr "Sluoksnis ne sąraše."
-
 msgid "Default (open, closed, new)"
 msgstr "Numatytas (atviros, uždarytos, naujos)"
 
@@ -6948,6 +6957,9 @@ msgstr "Rikiuoti pastabas"
 msgid "Sort"
 msgstr "Rikiuoti"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objekto tipas:"
 
@@ -7196,6 +7208,14 @@ msgstr "Atsiųsti pakeitimo turinį"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Atsiųsti pažymėtų pakeitimų turinį iš serverio"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Mano pakeitimai"
 
@@ -8581,9 +8601,6 @@ msgstr "Įveskite vietovės pavadinimą paieškai"
 msgid "Areas around places"
 msgstr "Plotai apie vietoves"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Tuščios nuorodos reikšmė, tikriausiai trūkstamos žymos."
-
 msgid "Search ..."
 msgstr "Ieškoti ..."
 
@@ -9222,6 +9239,9 @@ msgstr "Neįrašyti pakeitimai - Įrašyti/Įkelti prieš išeinant?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Neįrašyti pakeitimai - Įrašyti/Įkelti prieš ištrinant?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Įkeliami ir įrašomi pakeisti sluoksniai..."
 
@@ -9301,6 +9321,12 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "Išeiti iš JOSM neįrašius pakeitimų. Neįrašyti pakeitimai bus prarasti."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Šalinti dabar!"
 
@@ -9314,6 +9340,12 @@ msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 "Išeiti iš JOSM įrašant. Neįrašyti pakeitimai įkeliami ir/arba įrašomi."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Atlikti veiksmus prieš šalinant"
 
@@ -11625,6 +11657,9 @@ msgstr "Piešti vienpusio eismo rodykles."
 msgid "Draw segment order numbers"
 msgstr "Piešti segmentų tvarkos numerius"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Piešti atsiųstų duomenų ribas"
 
@@ -13880,6 +13915,9 @@ msgstr "NMEA importo sėkmė:"
 msgid "NMEA import failure!"
 msgstr "NMEA importo nesėkmė!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Tuščios nuorodos reikšmė, tikriausiai trūkstamos žymos."
+
 msgid "Note Files"
 msgstr "Pastabų failai"
 
@@ -14263,6 +14301,9 @@ msgstr "Išsiunčiami duomenys ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "Atsiunčiami duomenys…"
 
@@ -16137,6 +16178,9 @@ msgstr "Tiris: DGM (Reljefo modelis)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Paviršiaus modelis)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viena: Mehrzweckkarte (pagrindinės paskirties)"
 
@@ -16248,7 +16292,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -16431,6 +16478,9 @@ msgstr "Dronų nuotraukos 2014 (Haitis)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16725,18 +16775,6 @@ msgstr "Freemap.sk dviračiams"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk slidinėjimams"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakijos EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakijos EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakijos istoriniai žemėlapiai"
 
@@ -16746,6 +16784,9 @@ msgstr "RABA-KGZ: Slovėnijos dirbamos žemės naudojimas"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slovėnijos užstatytos teritorijos"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Pietų Afrika CD:NGI oro nuotraukos"
 
@@ -16878,6 +16919,9 @@ msgstr "JAV miškų aptarnaujamieji keliai"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraina - Ortofotožemėlapiai 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr "Septintos serijos (OS7)"
 
@@ -17245,6 +17289,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Atsiunčia OSM duomenis palei kelią"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17365,6 +17412,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Padeda vektorizuoti WMS atvaizdžius."
 
@@ -17570,6 +17620,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17592,6 +17647,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17750,6 +17808,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -19070,6 +19132,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Brasta"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Keliai"
 
@@ -20690,6 +20755,9 @@ msgstr "Kilimo/leidimosi takas"
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -21360,10 +21428,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
-msgstr "Telefono Numeris"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -21378,6 +21446,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr "Automatinis defibriliatorius"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Telefono Numeris"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -22247,6 +22321,10 @@ msgid "university"
 msgstr "universitetas"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "ligoninė"
 
@@ -22331,6 +22409,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -24536,8 +24618,14 @@ msgstr "Gamtos draustinis"
 msgid "Scree"
 msgstr "Nuobirynas"
 
-msgid "An accumulation of loose rocks."
-msgstr "Palaidų uolienų sankaupa."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr ""
@@ -25210,16 +25298,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -25228,18 +25310,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -25252,18 +25322,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -25456,9 +25514,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -25468,6 +25537,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr "{0} kartu su {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -25483,39 +25558,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr "{0} ant įtartino objekto"
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Įtartina žymų kombinacija: {0} ir {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25534,9 +25594,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} pasenusi"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -25595,10 +25664,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "raktas su nedažnu simboliu"
 
@@ -25614,7 +25689,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25659,8 +25734,8 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr "Persidengiančios vienodos žemėnaudos"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} privalo būti prijungta prie kelio"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "taškas jungia vandens kelią ir tiltą"
@@ -25693,6 +25768,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr "sutrumpintas gatvės pavadinimas"
 
@@ -25711,6 +25789,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -25801,10 +25882,13 @@ msgstr "nežinoma žydiška denominacija"
 msgid "{0} is unnecessary"
 msgstr "{0} yra nereikalinga"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} yra nereikalinga {1}"
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -26056,6 +26140,27 @@ msgstr "Išsiunčiamas GPX pėdsakas"
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -26396,6 +26501,403 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
+msgid "Mapillary Images"
+msgstr "Mapillary vaizdai"
+
+msgid "Mapillary layer"
+msgstr "Mapillary sluoksnis"
+
+msgid "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Sukurti Mapillary sluoksnį"
+
+msgid "Start Mapillary layer"
+msgstr "Pradėti Mapillary sluoksnį"
+
+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 "Select pictures"
+msgstr "Pažymėkite nuotraukas"
+
+msgid "Import pictures into sequence"
+msgstr "Importuoti nuotraukas į seką"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importuoti nuotraukas į Mapillary sluoksnį kaip seką"
+
+msgid "Join mode"
+msgstr "Sujungimo veiksena"
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr "Išsiųsti nuotraukas"
+
+msgid "Upload Mapillary pictures"
+msgstr "Išsiųsti Mapillary nuotraukas"
+
+msgid "Upload pictures."
+msgstr "Išsiųsti nuotraukas."
+
+msgid "Walk mode"
+msgstr "Ėjimo veiksena"
+
+msgid "Start walk mode"
+msgstr "Pradėti ėjimo veikseną"
+
+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 "View in website"
+msgstr "Peržiūrėti svetainėje"
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+msgstr ""
+
+msgid "Speed limit"
+msgstr ""
+
+msgid "Give way"
+msgstr "Duoti kelią"
+
+msgid "No entry"
+msgstr ""
+
+msgid "Intersection danger"
+msgstr ""
+
+msgid "Mandatory direction (any)"
+msgstr ""
+
+msgid "Uneven road"
+msgstr "Nelygus kelias"
+
+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 filtras"
+
+msgid "Open Mapillary filter dialog"
+msgstr "Atverti Mapillary filtro dialogo langą"
+
+msgid "Not older than: "
+msgstr ""
+
+msgid "Downloaded images"
+msgstr ""
+
+msgid "Only images with signs"
+msgstr ""
+
+msgid "Choose signs"
+msgstr ""
+
+msgid "Mapillary history"
+msgstr "Mapillary istorija"
+
+msgid "Open Mapillary history dialog"
+msgstr "Atverti Mapillary istorijos dialogo langą"
+
+msgid "Mapillary picture"
+msgstr "Mapillary nuotrauka"
+
+msgid "Open Mapillary window"
+msgstr "Atverti Mapillary langą"
+
+msgid "Mapillary dialog"
+msgstr "Mapillary dialogo langas"
+
+msgid "Open Mapillary main dialog"
+msgstr "Atverti Mapillary pagrindinį dialogo 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 ""
+
+msgid "Move to picture''s location with next/previous buttons"
+msgstr ""
+
+msgid "Preview images when hovering its icon"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr ""
 
@@ -28074,9 +28576,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Login"
-msgstr ""
-
 msgid "Enable autologin"
 msgstr ""
 
@@ -28109,9 +28608,6 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Logout"
-msgstr ""
-
 msgid "Clear log"
 msgstr ""
 
@@ -28665,9 +29161,6 @@ msgstr ""
 msgid "cm"
 msgstr ""
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -28843,21 +29336,9 @@ msgstr ""
 msgid "Import vector graphics"
 msgstr ""
 
-msgid "Scale:"
-msgstr ""
-
-msgid "unit(s) = "
-msgstr ""
-
-msgid "Importing..."
-msgstr ""
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29062,6 +29543,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Pakeisti geometriją"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -29308,400 +29844,6 @@ msgstr ""
 msgid "Missing input data"
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr "Mapillary vaizdai"
-
-msgid "Mapillary layer"
-msgstr "Mapillary sluoksnis"
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Sukurti Mapillary sluoksnį"
-
-msgid "Start Mapillary layer"
-msgstr "Pradėti Mapillary sluoksnį"
-
-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 "Select pictures"
-msgstr "Pažymėkite nuotraukas"
-
-msgid "Import pictures into sequence"
-msgstr "Importuoti nuotraukas į seką"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importuoti nuotraukas į Mapillary sluoksnį kaip seką"
-
-msgid "Join mode"
-msgstr "Sujungimo veiksena"
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr "Išsiųsti nuotraukas"
-
-msgid "Upload Mapillary pictures"
-msgstr "Išsiųsti Mapillary nuotraukas"
-
-msgid "Upload pictures."
-msgstr "Išsiųsti nuotraukas."
-
-msgid "Walk mode"
-msgstr "Ėjimo veiksena"
-
-msgid "Start walk mode"
-msgstr "Pradėti ėjimo veikseną"
-
-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 "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr "Peržiūrėti svetainėje"
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr "Duoti kelią"
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr "Nelygus kelias"
-
-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 filtras"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Atverti Mapillary filtro dialogo langą"
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr "Mapillary istorija"
-
-msgid "Open Mapillary history dialog"
-msgstr "Atverti Mapillary istorijos dialogo langą"
-
-msgid "Mapillary picture"
-msgstr "Mapillary nuotrauka"
-
-msgid "Open Mapillary window"
-msgstr "Atverti Mapillary langą"
-
-msgid "Mapillary dialog"
-msgstr "Mapillary dialogo langas"
-
-msgid "Open Mapillary main dialog"
-msgstr "Atverti Mapillary pagrindinį dialogo 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 ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Išmatuotos reikšmės"
 
@@ -30376,7 +30518,7 @@ msgid "Open Visible..."
 msgstr ""
 
 msgid "Open only files that are visible in current view."
-msgstr ""
+msgstr "Atverti tik failus, kurie yra matomi dabartiniame rodinyje."
 
 msgid "No view open - cannot determine boundaries!"
 msgstr ""
@@ -31177,6 +31319,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "bėgiai"
 
@@ -31272,9 +31417,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Viešasis transportas: bendros GTFS stotelės"
 
@@ -32292,6 +32434,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -32742,6 +32944,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Pirmyn"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Atgal"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -33354,7 +33634,7 @@ msgid "Add missing nodes at intersections of selected ways."
 msgstr "Pridėti trūkstamus taškus pažymėtų kelių sankirtose."
 
 msgid "Please select one or more ways with intersections of segments."
-msgstr ""
+msgstr "Pažymėkite vieną ar daugiau kelių su segmentų susikirtimu."
 
 msgid "Align Way Nodes"
 msgstr "Lygiuoti kelio taškus"
@@ -33610,9 +33890,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Pakeisti geometriją"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Pakeisti pažymėto objekto geometriją nauja"
 
@@ -33639,6 +33916,8 @@ 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 ""
@@ -33763,7 +34042,7 @@ msgid "Select highway for the name/ref given"
 msgstr "Pažymėti greitkelį su nustatyta name/ref reikšme"
 
 msgid "Please select one or two ways for this action"
-msgstr ""
+msgstr "Pažymėkite vieną ar du kelius šiam veiksmui"
 
 msgid "Select last modified nodes"
 msgstr "Pažymėti vėliausiai modifikuotus taškus"
@@ -33810,15 +34089,9 @@ msgstr "pradeda/pristabdo vaizdo grojimą"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "Atgal"
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "Pirmyn"
-
 msgid "jumps n sec forward"
 msgstr ""
 
@@ -34068,7 +34341,7 @@ msgid "Wikidata"
 msgstr ""
 
 msgid "Fetches all coordinates from Wikidata in the current view"
-msgstr ""
+msgstr "Gauna visas koordinates iš Wikidata dabartiniame rodinyje"
 
 msgid "Fetches all coordinates from Wikipedia in the current view"
 msgstr "Gauna visas koordinates iš Vikipedijos dabartiniame rodinyje"
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index b2958da..89b38f9 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:10+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:56+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: lv\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -205,28 +205,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Pievienot attēla slāni {0}"
 
-msgid "Error"
-msgstr "Kļūda"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Kļūda"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3289,9 +3289,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3693,10 +3690,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3733,6 +3730,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3742,6 +3742,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3778,6 +3781,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3996,6 +4005,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4206,30 +4221,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4473,9 +4488,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4995,9 +5007,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6417,6 +6426,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objekta tips"
 
@@ -6656,6 +6668,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7928,9 +7948,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8494,6 +8511,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8545,6 +8565,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8557,6 +8583,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10610,6 +10642,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12695,6 +12730,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13057,6 +13095,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14700,6 +14741,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14811,7 +14855,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14990,6 +15037,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15284,18 +15334,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15305,6 +15343,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15437,6 +15478,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15804,6 +15848,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15918,6 +15965,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16115,6 +16165,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16137,6 +16192,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16293,6 +16351,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17613,6 +17675,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19232,6 +19297,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19902,10 +19970,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19920,6 +19988,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20789,6 +20863,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20873,6 +20951,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23078,7 +23160,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23745,16 +23833,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23763,18 +23845,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23787,18 +23857,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23991,9 +24049,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24003,6 +24072,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24018,39 +24093,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24069,9 +24129,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24126,10 +24195,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24145,7 +24220,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24190,7 +24265,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24224,6 +24299,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24242,6 +24320,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24332,10 +24413,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24581,6 +24665,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24919,3267 +25024,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29641,6 +29783,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29736,9 +29881,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30750,6 +30892,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31197,6 +31399,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32023,9 +32303,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32219,15 +32496,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index d6c78b8..061c02e 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:13+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:57+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: mk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -207,28 +207,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Грешка"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Грешка"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3281,9 +3281,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3685,10 +3682,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3725,6 +3722,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3734,6 +3734,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3770,6 +3773,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3988,6 +3997,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4198,30 +4213,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4465,9 +4480,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4988,9 +5000,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6410,6 +6419,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6649,6 +6661,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7921,9 +7941,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8487,6 +8504,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8538,6 +8558,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8550,6 +8576,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10603,6 +10635,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12685,6 +12720,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13047,6 +13085,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14690,6 +14731,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14801,7 +14845,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14980,6 +15027,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15274,18 +15324,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15295,6 +15333,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15427,6 +15468,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15794,6 +15838,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15908,6 +15955,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16105,6 +16155,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16127,6 +16182,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16283,6 +16341,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17603,6 +17665,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19222,6 +19287,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19892,10 +19960,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19910,6 +19978,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20779,6 +20853,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20863,6 +20941,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23068,7 +23150,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23735,16 +23823,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23753,18 +23835,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23777,18 +23847,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23981,9 +24039,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23993,6 +24062,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24008,39 +24083,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24059,9 +24119,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24116,10 +24185,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24135,7 +24210,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24180,7 +24255,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24214,6 +24289,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24232,6 +24310,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24322,10 +24403,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24571,6 +24655,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24909,3267 +25014,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29631,6 +29773,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29726,9 +29871,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30740,6 +30882,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31187,6 +31389,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32013,9 +32293,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32209,15 +32486,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/mr.po b/i18n/po/mr.po
index cf44cf5..f6022cc 100644
--- a/i18n/po/mr.po
+++ b/i18n/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:14+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:58+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: mr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -206,18 +206,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr ""
-
-msgid "Select image format for WMS layer"
-msgstr "WMS थरासाठी प्रतिमा प्रारूप निवडा"
-
-msgid "Select WMS layers"
-msgstr "WMS थर निवडा"
-
-msgid "Add layers"
-msgstr ""
-
 msgid "Invalid service URL."
 msgstr ""
 
@@ -230,6 +218,18 @@ msgstr ""
 msgid "Could not parse WMS layer list."
 msgstr ""
 
+msgid "Error"
+msgstr ""
+
+msgid "Select image format for WMS layer"
+msgstr "WMS थरासाठी प्रतिमा प्रारूप निवडा"
+
+msgid "Select WMS layers"
+msgstr "WMS थर निवडा"
+
+msgid "Add layers"
+msgstr ""
+
 msgid "Add Node..."
 msgstr ""
 
@@ -3306,9 +3306,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3710,10 +3707,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3750,6 +3747,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3759,6 +3759,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3795,6 +3798,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4013,6 +4022,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4223,30 +4238,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4490,9 +4505,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5013,9 +5025,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "थर यादीत नाही."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6435,6 +6444,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "वस्तू प्रकार:"
 
@@ -6674,6 +6686,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "माझे बदलसंच"
 
@@ -7946,9 +7966,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8512,6 +8529,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8563,6 +8583,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8575,6 +8601,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10639,6 +10671,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12720,6 +12755,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13082,6 +13120,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14725,6 +14766,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14836,7 +14880,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15015,6 +15062,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15309,18 +15359,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15330,6 +15368,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15462,6 +15503,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15829,6 +15873,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15943,6 +15990,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16140,6 +16190,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16162,6 +16217,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16318,6 +16376,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17638,6 +17700,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19257,6 +19322,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19927,10 +19995,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19945,6 +20013,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20814,6 +20888,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20898,6 +20976,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23103,7 +23185,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23770,16 +23858,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23788,18 +23870,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23812,18 +23882,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24016,9 +24074,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24028,6 +24097,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24043,39 +24118,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24094,9 +24154,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24151,10 +24220,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24170,7 +24245,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24215,7 +24290,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24249,6 +24324,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24267,6 +24345,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24357,10 +24438,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24606,6 +24690,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24944,3267 +25049,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "No address nodes inside buildings found"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "on polygon"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29666,6 +29808,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29761,9 +29906,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30775,6 +30917,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31222,6 +31424,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32048,9 +32328,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32244,15 +32521,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 2c9cb29..d810cf3 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:15+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:58+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ms\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 30185aa..8040c51 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-20 10:10+0000\n"
-"Last-Translator: Thor K. H. <nitrolinken at gmail.com>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-10-06 19:11+0000\n"
+"Last-Translator: Syver Stensholt <sssandum at gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:17+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:00+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: nb\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -210,18 +210,6 @@ msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor."
 msgid "Add imagery layer {0}"
 msgstr "Legg til bildelag {0}"
 
-msgid "Error"
-msgstr "Feil"
-
-msgid "Select image format for WMS layer"
-msgstr "Velg bildeformat for WMS-lag"
-
-msgid "Select WMS layers"
-msgstr "Velg WMS-lag"
-
-msgid "Add layers"
-msgstr "Legg til lag"
-
 msgid "Invalid service URL."
 msgstr "Ugyldig URL for tjeneste."
 
@@ -234,6 +222,18 @@ msgstr "Kunne ikke hente liste med WMS-lag."
 msgid "Could not parse WMS layer list."
 msgstr "Kunne ikke tolke liste med WMS-lag."
 
+msgid "Error"
+msgstr "Feil"
+
+msgid "Select image format for WMS layer"
+msgstr "Velg bildeformat for WMS-lag"
+
+msgid "Select WMS layers"
+msgstr "Velg WMS-lag"
+
+msgid "Add layers"
+msgstr "Legg til lag"
+
 msgid "Add Node..."
 msgstr "Legg til node…"
 
@@ -3369,9 +3369,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3775,10 +3772,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3815,6 +3812,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr "Denne testen sjekker om kystlinjene er korrekte."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Feil retning på Kystlinje: Land er ikke på venstre side"
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3824,6 +3824,9 @@ msgstr "Kystlinje i uorden"
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3860,6 +3863,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4078,6 +4087,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4293,30 +4308,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Egenskap Verdi inneholder HTML koding"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Nøkkel «{0}» finnes ikke i objektmalene"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr "Objektmalene inneholder ikke Nøkkelen"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr ""
+msgid "Key ''{0}'' not in presets."
+msgstr "Nøkkel «{0}» finnes ikke i objektmalene"
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr "Objektmalen har ikke Egenskapsverdi"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene"
+
 msgid "FIXMES"
 msgstr "FIXMEs"
 
@@ -4562,9 +4577,6 @@ msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 "Testen finner linjer som elver, land eller kystlinje med feil retning."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Feil retning på Kystlinje: Land er ikke på venstre side"
-
 msgid "Reversed land: land not on left side"
 msgstr "Feil retning på Landlinje: Land er ikke på venstre side"
 
@@ -5085,9 +5097,6 @@ msgstr "Lengdegrad ved musepekeren."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "Laget er ikke i lista."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6535,6 +6544,9 @@ msgstr ""
 msgid "Sort"
 msgstr "Sorter"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objekttype:"
 
@@ -6774,6 +6786,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -8051,9 +8071,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer-feil, muligens manglende egenskaper."
-
 msgid "Search ..."
 msgstr ""
 
@@ -8642,6 +8659,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8693,6 +8713,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8705,6 +8731,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10793,6 +10825,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr "Tegn segment-nummer"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn omfang af nedlastede data"
 
@@ -12899,6 +12934,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "Feil ved import av NMEA data!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Null pointer-feil, muligens manglende egenskaper."
+
 msgid "Note Files"
 msgstr ""
 
@@ -13264,6 +13302,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14917,6 +14958,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15028,7 +15072,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15207,6 +15254,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15501,18 +15551,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15522,6 +15560,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15654,6 +15695,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -16023,6 +16067,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16141,6 +16188,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "For vektorisering av  WMS bilder."
 
@@ -16347,6 +16397,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16369,6 +16424,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16525,6 +16583,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17845,6 +17907,9 @@ msgstr ""
 msgid "Ford"
 msgstr "Vadested"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Mindre veier"
 
@@ -19464,6 +19529,9 @@ msgstr "Rullebane"
 msgid "Taxiway"
 msgstr "Taksebane"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Helikopterdekk"
 
@@ -20134,11 +20202,11 @@ msgstr "Punktnummer"
 msgid "Point Name"
 msgstr "Navn på punkt"
 
-msgid "Phone Number"
-msgstr "Telefonnummer"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -20152,6 +20220,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -21021,6 +21095,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -21105,6 +21183,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23310,7 +23392,13 @@ msgstr "Naturreservat"
 msgid "Scree"
 msgstr "Steinur"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23981,16 +24069,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23999,18 +24081,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24023,18 +24093,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24227,9 +24285,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr "{0} uten {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} uten {1} eller {2}"
 
@@ -24239,6 +24308,12 @@ msgstr "{0} uten {1}, {2} eller {3}"
 msgid "{0} together with {1}"
 msgstr "{0} sammen med {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "ufullstendig objekt: kun {0}"
 
@@ -24254,39 +24329,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr "{0} på mistenksomt objekt"
 
-msgid "restaurant without name"
-msgstr "restaurant uten navn"
-
-msgid "{0} used with {1}"
-msgstr "{0} brukt med {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "naturlig vann angitt for svømmebasseng"
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} bør være på noden der {1} og {2} krysser"
-
 msgid "alternative name without {0}"
 msgstr "alternativt navn uten {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "ufullstendig bruk av {0} på linje uten {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24305,9 +24365,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' er meningsløst, bruk mer spesifike egenskaper, f.eks. \"{1}\""
@@ -24368,10 +24437,16 @@ msgstr "Uspesifik egenskap {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Definisjonen til {0} er uklar"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24387,7 +24462,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24432,7 +24507,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24466,6 +24541,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} bør være på noden der {1} og {2} krysser"
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24484,6 +24562,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr "{0} brukt med {1}"
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24574,10 +24655,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24825,6 +24909,27 @@ msgstr "GPX Spor lastes opp"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Last opp spor til openstreetmap.org"
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25163,6 +25268,403 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
+msgid "Mapillary Images"
+msgstr ""
+
+msgid "Mapillary layer"
+msgstr ""
+
+msgid "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr ""
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr ""
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr ""
 
@@ -26836,9 +27338,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Login"
-msgstr ""
-
 msgid "Enable autologin"
 msgstr ""
 
@@ -26871,9 +27370,6 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Logout"
-msgstr ""
-
 msgid "Clear log"
 msgstr ""
 
@@ -27422,9 +27918,6 @@ msgstr ""
 msgid "cm"
 msgstr ""
 
-msgid "m"
-msgstr ""
-
 msgid "km"
 msgstr ""
 
@@ -27594,21 +28087,9 @@ msgstr "Importerte bilder"
 msgid "Import vector graphics"
 msgstr ""
 
-msgid "Scale:"
-msgstr ""
-
-msgid "unit(s) = "
-msgstr ""
-
-msgid "Importing..."
-msgstr ""
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -27813,6 +28294,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr ""
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -28066,400 +28602,6 @@ msgstr ""
 msgid "Missing input data"
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Måleverdier"
 
@@ -29920,6 +30062,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "jernbane"
 
@@ -30015,9 +30160,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -31033,6 +31175,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terasse"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31480,6 +31682,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Spill av"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32308,9 +32588,6 @@ msgstr "Find primitive med disse egenskapene"
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32504,15 +32781,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "Spill av"
-
 msgid "jumps n sec forward"
 msgstr ""
 
@@ -32787,10 +33058,10 @@ msgid "Opens the Wikipedia article of the selected item in a browser"
 msgstr ""
 
 msgid "Sets the default language for the Wikipedia articles"
-msgstr ""
+msgstr "Angir standardspråket for Wikipedia artiklene"
 
 msgid "Enter the Wikipedia language"
-msgstr ""
+msgstr "Angi Wikipedia språket"
 
 msgid ""
 "Adds a ''wikipedia'' tag corresponding to this article to the selected "
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 706a8ef..6f9a32b 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:16+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:59+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3277,9 +3277,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3681,10 +3678,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3721,6 +3718,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3730,6 +3730,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3766,6 +3769,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3984,6 +3993,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4194,30 +4209,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4461,9 +4476,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4984,9 +4996,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6406,6 +6415,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6645,6 +6657,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7917,9 +7937,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8483,6 +8500,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8534,6 +8554,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8546,6 +8572,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10599,6 +10631,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12680,6 +12715,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13042,6 +13080,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14685,6 +14726,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14796,7 +14840,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14975,6 +15022,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15269,18 +15319,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15290,6 +15328,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15422,6 +15463,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15789,6 +15833,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15903,6 +15950,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16100,6 +16150,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16122,6 +16177,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16278,6 +16336,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17598,6 +17660,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19217,6 +19282,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19887,10 +19955,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19905,6 +19973,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20774,6 +20848,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20858,6 +20936,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23063,7 +23145,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23730,16 +23818,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23748,18 +23830,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23772,18 +23842,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23976,9 +24034,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23988,6 +24057,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24003,39 +24078,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24054,9 +24114,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24111,10 +24180,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24130,7 +24205,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24175,7 +24250,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24209,6 +24284,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24227,6 +24305,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24317,10 +24398,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24566,6 +24650,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24904,3267 +25009,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29626,6 +29768,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29721,9 +29866,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30735,6 +30877,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31182,6 +31384,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32008,9 +32288,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32204,15 +32481,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index d0fa21f..f785d07 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-06-26 12:48+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-01 10:28+0000\n"
 "Last-Translator: DiGro <Unknown>\n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 04:47+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:40+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: nl\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -215,18 +215,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Afbeeldingslaag {0} toevoegen"
 
-msgid "Error"
-msgstr "Fout"
-
-msgid "Select image format for WMS layer"
-msgstr "Kies een afbeelding voor de WMS laag"
-
-msgid "Select WMS layers"
-msgstr "WMS-lagen selecteren"
-
-msgid "Add layers"
-msgstr "Lagen toevoegen"
-
 msgid "Invalid service URL."
 msgstr "Ongeldige service-URL."
 
@@ -239,6 +227,18 @@ msgstr "Kon geen lijst met WMS-lagen verkrijgen."
 msgid "Could not parse WMS layer list."
 msgstr "Kon geen lijst met WMS-lagen parsen."
 
+msgid "Error"
+msgstr "Fout"
+
+msgid "Select image format for WMS layer"
+msgstr "Kies een afbeelding voor de WMS laag"
+
+msgid "Select WMS layers"
+msgstr "WMS-lagen selecteren"
+
+msgid "Add layers"
+msgstr "Lagen toevoegen"
+
 msgid "Add Node..."
 msgstr "Knoop toevoegen..."
 
@@ -497,10 +497,10 @@ msgid "Download notes in current view"
 msgstr "Opmerkingen in huidige weergave downloaden"
 
 msgid "Download in current view"
-msgstr ""
+msgstr "Huidige weergave downloaden"
 
 msgid "Download map data from the OSM server in current view"
-msgstr ""
+msgstr "Kaartgegevens van de server van OSM in huidige weergave downloaden"
 
 msgid "Download object..."
 msgstr "Object downloaden..."
@@ -519,7 +519,7 @@ msgid "Duplicate"
 msgstr "Dupliceren"
 
 msgid "Duplicate selection."
-msgstr ""
+msgstr "Duplicaten selecteren."
 
 msgid "Exit"
 msgstr "Afsluiten"
@@ -1160,13 +1160,14 @@ msgid "Paste"
 msgstr "Plakken"
 
 msgid "Paste contents of clipboard."
-msgstr ""
+msgstr "Inhoud van klembord plakken."
 
 msgid "Paste at source position"
-msgstr ""
+msgstr "Plakken op bronpositie"
 
 msgid "Paste contents of clipboard at the position they were copied from."
 msgstr ""
+"Inhoud van het klembord op de positie van waar het werd gekopieerd plakken."
 
 msgid "Paste Tags"
 msgstr "Tags plakken"
@@ -1944,7 +1945,7 @@ msgid "Errors during download"
 msgstr "Fouten tijdens downloaden"
 
 msgid "Download Geo URL"
-msgstr ""
+msgstr "Geo URL downloaden"
 
 msgid "Download GPS"
 msgstr "GPS downloaden"
@@ -3070,7 +3071,7 @@ msgid "Change relation {0}"
 msgstr "Relatie {0} wijzigen"
 
 msgid "Change nodes of {0}"
-msgstr ""
+msgstr "Knopen wijzigen van {0}"
 
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Verwijder \"{0}\" voor knoop \"{1}\""
@@ -3621,9 +3622,6 @@ msgstr "Identificatie instellen matrix"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Geen lagen gedefinieerd door document getCapabalities: {0}"
 
-msgid "No layer selected"
-msgstr "Geen laag geselecteerd"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4063,12 +4061,12 @@ msgstr "Meerdere relaties associatedStreet"
 msgid "House number without street"
 msgstr "Huisnummer zonder straat"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Huisnummer ''{0}'' gedupliceerd"
-
 msgid "Duplicate house numbers"
 msgstr "Dubbele huisnummers"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Huisnummer ''{0}'' gedupliceerd"
+
 msgid "Multiple street names in relation"
 msgstr "Meerdere straatnamen in relatie"
 
@@ -4105,6 +4103,9 @@ msgstr "Kustlijnen"
 msgid "This test checks that coastlines are correct."
 msgstr "Deze test controleert of kustlijnen correct zijn."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Omgekeerde kustlijn: land niet aan linker zijde"
+
 msgid "Unconnected coastline"
 msgstr "Niet-verbonden kustlijn"
 
@@ -4114,6 +4115,9 @@ msgstr "Ongeordende kustlijn"
 msgid "Reversed coastline"
 msgstr "Omgekeerde kustlijn"
 
+msgid "invalid coastline"
+msgstr "ongeldige kustlijn"
+
 msgid "Conditional Keys"
 msgstr "Voorwaardelijke sleutels"
 
@@ -4150,6 +4154,12 @@ msgstr "Kruisende begrenzingen"
 msgid "Crossing barriers"
 msgstr "Kruisende barrières"
 
+msgid "Self crossing"
+msgstr "Zelf kruisend"
+
+msgid "Self-crossing ways"
+msgstr "Zelf-kruisende wegen"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4387,6 +4397,12 @@ msgstr "Een lid van een multipolygoonrelatie heeft een niet-geschikte rol"
 msgid "Non-Way in multipolygon"
 msgstr "Multipolygoonrelatie bevat een lid dat geen ''weg'' is"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr "Lid/Leden Multipolygoon herhaald met verschillende rol"
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr "Lid/Leden Multipolygoon herhaald met dezelfde rol"
+
 msgid "Missing name:* translation"
 msgstr "Ontbrekende vertaling name:*"
 
@@ -4615,30 +4631,30 @@ msgstr "Waarden van eigenschappen bevatten meerdere witruimten"
 msgid "Property values contain HTML entity"
 msgstr "Waarden voor eigenschap bevatten HTML-codes"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Sleutel ''{0}'' lijkt op ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Fout gespelde sleutel eigenschap"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Sleutel \"{0}\" ontbreekt in voorkeuzen."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Sleutel ''{0}'' lijkt op ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Voorkeuzen bevatten geen sleutel voor eigenschap"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Waarde ''{0}'' voor sleutel ''{1}'' ziet er uit als ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Sleutel \"{0}\" ontbreekt in voorkeuzen."
 
 msgid "Misspelled property value"
 msgstr "Verkeerd gespelde waarde voor eigenschap"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuzen."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Waarde ''{0}'' voor sleutel ''{1}'' ziet er uit als ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Voorkeuzen bevatten geen waarde voor eigenschap"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuzen."
+
 msgid "FIXMES"
 msgstr "HERSTEL-MIJ''S"
 
@@ -4890,9 +4906,6 @@ msgstr "Verkeerd geordende wegen"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "De test controleert de richting van water-, land of kustlijnwegen."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Omgekeerde kustlijn: land niet aan linker zijde"
-
 msgid "Reversed land: land not on left side"
 msgstr "Omgekeerde land: land niet aan linker zijde"
 
@@ -5158,7 +5171,7 @@ msgid "Make sure you load some data if you use --selection."
 msgstr "Zorg dat u wat gegevens inlaadt, als u --selection gebruikt."
 
 msgid "Log level is at {0} ({1}, {2})"
-msgstr ""
+msgstr "Niveau van log is op {0} ({1}, {2})"
 
 msgid "Plugin loading skipped"
 msgstr "Plug-in laden overgeslagen"
@@ -5449,9 +5462,6 @@ msgstr "De geografische lengtegraad bij de cursor."
 msgid "System of measurement changed to {0}"
 msgstr "Stelsel van maten ingesteld op {0}"
 
-msgid "Layer not in list."
-msgstr "Laag niet in lijst."
-
 msgid "Default (open, closed, new)"
 msgstr "Standaard (open, closed, new)"
 
@@ -7025,6 +7035,9 @@ msgstr "Opmerkingen sorteren"
 msgid "Sort"
 msgstr "Sorteren"
 
+msgid "Open the note in an external browser"
+msgstr "De opemerking in een externe browser openen"
+
 msgid "Object type:"
 msgstr "Objecttype:"
 
@@ -7281,6 +7294,16 @@ msgid "Download the content of the selected changesets from the server"
 msgstr ""
 "Inhoud voor de geselecteerde wijzigingensets downloaden van de server"
 
+msgid "Download changed objects"
+msgstr "Download aangepaste objecten"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+"De huidige versie van de gewijzigde objecten in de geselecteerde "
+"wijzigingensets downloaden"
+
 msgid "My changesets"
 msgstr "Mijn wijzigingensets"
 
@@ -8717,9 +8740,6 @@ msgstr "Voer een plaatsnaam in om naar te zoeken"
 msgid "Areas around places"
 msgstr "Gebieden rond plaatsen"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer-exceptie, mogelijk ontbreken er enkele tags."
-
 msgid "Search ..."
 msgstr "Zoeken ..."
 
@@ -9364,6 +9384,9 @@ msgstr "Niet-opgeslagen wijzigingen - Opslaan/Uploaden vóór afsluiten?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Niet-opgeslagen wijzigingen - Opslaan/Uploaden vóór verwijderen"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "Niet opgeslagen wijzigingen - Opslaan/Uploaden vóór opnieuw starten?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Uploaden en opslaan van gewijzigde lagen ..."
 
@@ -9434,6 +9457,14 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "Sluit JOSM af zonder op te slaan. Niet-opgeslagen wijzigingen gaan verloren"
 
+msgid "Restart now!"
+msgstr "Nu opnieuw opstarten!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+"JOSM opnieuw opstarten zonder op te slaan. Niet opgeslagen wijzigingen gaan "
+"verloren."
+
 msgid "Delete now!"
 msgstr "Nu verwijderen!"
 
@@ -9449,6 +9480,14 @@ msgstr ""
 "Sluit JOSM af met opslaan. Niet-opgeslagen wijzigingen worden geüpload en/of "
 "opgeslagen."
 
+msgid "Perform actions before restarting"
+msgstr "Acties uitvoeren vóór opnieuw opstarten"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+"JOSM opnieuw opstarten met opslaan. Niet opgeslagen wijzigingen worden "
+"geüpload  en/of opgeslagen."
+
 msgid "Perform actions before deleting"
 msgstr "Voer de acties uit vóór het verwijderen"
 
@@ -10096,8 +10135,8 @@ msgstr "Laag opslaan"
 
 msgid "{0} note"
 msgid_plural "{0} notes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} opmerking"
+msgstr[1] "{0} opmerkingen"
 
 msgid "Notes layer"
 msgstr "Laag met opmerkingen"
@@ -11799,6 +11838,9 @@ msgstr "Teken éénrichting-pijlen."
 msgid "Draw segment order numbers"
 msgstr "Nummers segmentvolgorde tekenen"
 
+msgid "Draw segment order numbers on selected way"
+msgstr "Volgnummers voor segment op geselecteerde weg tekenen"
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Teken grenzen van gedownload gebied"
 
@@ -12714,29 +12756,31 @@ msgid "Configure the list of sites where plugins are downloaded from"
 msgstr "Instellen van de lijst met sites voor het downloaden van plug-ins"
 
 msgid "Load from list..."
-msgstr ""
+msgstr "Lijst laden vanaf..."
 
 msgid "Load plugins from a list of plugins"
-msgstr ""
+msgstr "Plug-ins uit een lijst van plug-ins laden"
 
 msgid "Disable all other plugins"
-msgstr ""
+msgstr "Alle andere plug-ins uitschakelen"
 
 msgid "Enter a list of plugins you want to download."
-msgstr ""
+msgstr "Voer een lijst in van plug-ins die u wilt downloaden."
 
 msgid ""
 "You should add one plugin id per line, version information is ignored."
 msgstr ""
+"U dient één ID voor een plug-in per regel in te voeren, informatie over de "
+"versie wordt genegeerd."
 
 msgid "You can copy+paste the list of a status report here."
-msgstr ""
+msgstr "U kunt de lijst van een statusrapport hier kopiëren en plakken."
 
 msgid "Load plugins from list"
-msgstr ""
+msgstr "Plug-ins uit lijst laden"
 
 msgid "The following plugins were not found. Continue anyway?"
-msgstr ""
+msgstr "De volgende plug-ins werden niet gevonden. Toch doorgaan?"
 
 msgid "Add JOSM Plugin description URL."
 msgstr "Voeg URL toe voor de beschrijving van de JOSM plug-in"
@@ -13831,7 +13875,7 @@ msgstr ""
 "bestand ''{0}'' mislukt. Exceptie was: {1}"
 
 msgid "The requested URL {0} was not found"
-msgstr ""
+msgstr "De verzochte URL {0} werd niet gevonden"
 
 msgid "Failed to rename file {0} to {1}."
 msgstr "Hernoemen van bestand {0} naar {1} mislukt."
@@ -14124,6 +14168,9 @@ msgstr "NMEA importeren gelukt:"
 msgid "NMEA import failure!"
 msgstr "Importeren van NMEA mislukt!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Null pointer-exceptie, mogelijk ontbreken er enkele tags."
+
 msgid "Note Files"
 msgstr "Bestanden voor Opmerkingen"
 
@@ -14522,6 +14569,9 @@ msgstr "Uploaden van gegevens ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Onverwachte ID voor primitief van OSM gevonden"
 
+msgid "Failed to evaluate {0}"
+msgstr "Evalueren van {0} mislukt"
+
 msgid "Downloading data..."
 msgstr "Gegevens downloaden..."
 
@@ -14705,7 +14755,7 @@ msgid "Confirm Remote Control action"
 msgstr "Bevestig actie van Afstandsbediening"
 
 msgid "The following keys are mandatory, but have not been provided: {0}"
-msgstr ""
+msgstr "De volgende sleutels zijn verplicht, maar zijn niet opgegeven: {0}"
 
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -15041,7 +15091,7 @@ msgstr[0] "De plug-in zal niet worden geladen."
 msgstr[1] "De plug-ins zullen niet worden geladen."
 
 msgid "Determining plugins to load..."
-msgstr ""
+msgstr "Bepalen welke plug-ins te laden..."
 
 msgid "Removing deprecated plugins..."
 msgstr "Verwijderen van vervallen plug-ins..."
@@ -15872,18 +15922,21 @@ msgid ""
 "This is always a coding error. If you are running the latest version of "
 "JOSM, please consider being kind and file a bug report."
 msgstr ""
+"Er trad een onverwachte fout op.\n"
+"Dit is altijd een fout in de codering. Als u de laatste versie van JOSM "
+"gebruikt, overweeg dan om een foutenrapport in te dienen."
 
 msgid "Debug information"
-msgstr ""
+msgstr "Informatie over debuggen"
 
 msgid "Manually report at:"
-msgstr ""
+msgstr "Handmatig rapport op:"
 
 msgid "Is JOSM up to date?"
-msgstr ""
+msgstr "Is JOSM up to date?"
 
 msgid "Send bug report"
-msgstr ""
+msgstr "Foutenrapport verzenden"
 
 msgid ""
 "If you are running the latest version of JOSM and the plugins, please file a "
@@ -15892,18 +15945,23 @@ msgid ""
 "include information on how to reproduce the error and try to supply as much "
 "detail as possible."
 msgstr ""
+"Als u de laatste versie van JOSM en de plug-ins uitvoert, dien dan een "
+"foutenrapport in in het systeem voor het volgen van fouten.\n"
+"Daar zou de informatie over de fout al voor u zijn ingevuld. Vermeld ook "
+"informatie over hoe de fout te reproduceren en probeer zoveel mogelijk "
+"details te geven."
 
 msgid "Report Bug"
 msgstr "Fout melden"
 
 msgid "Suppress this error for this session."
-msgstr ""
+msgstr "Onderdruk deze fout voor deze sessie."
 
 msgid "Suppress further error dialogs for this session."
 msgstr "Onderdruk verdere dialoogvensters voor fouten voor deze sessie."
 
 msgid "Ignore this error."
-msgstr ""
+msgstr "Negeer deze fout."
 
 msgid ""
 "Opening the bug report failed. Please report manually using this website:"
@@ -15912,33 +15970,38 @@ msgstr ""
 "van deze website:"
 
 msgid "Include the system status report."
-msgstr ""
+msgstr "Neem het systeem statusrapport op."
 
 msgid "Include information about the data you were working on."
-msgstr ""
+msgstr "Geef informatie over de gegevens waarmee u werkte."
 
 msgid "Include all stack traces."
-msgstr ""
+msgstr "Neem alle stack traces op."
 
 msgid "Your current version of JOSM is {0}"
-msgstr ""
+msgstr "Uw huidige versie van JOSM is {0}"
 
 msgid "JOSM is searching for updates..."
-msgstr ""
+msgstr "JOSM zoekt naar updates..."
 
 msgid "An error occured while checking if your JOSM instance is up to date."
 msgstr ""
+"Er trad een fout op bij het controleren of uw instantie van JOSM up to date "
+"is."
 
 msgid "JOSM is up to date."
-msgstr ""
+msgstr "JOSM is up to date."
 
 msgid "JOSM is out of date. The current version is {0}. Try updating JOSM."
 msgstr ""
+"JOSM is verouderd. De huidige versie is {0}. Probeer JOSM bij te werken."
 
 msgid ""
 "Before you file a bug report make sure you have updated to the latest "
 "version of JOSM here:"
 msgstr ""
+"Zorg er hier voor, voordat u een foutenrapport indient, dat u bent "
+"bijgewerkt naar de laatste versie van JOSM:"
 
 msgid "Update JOSM"
 msgstr "JOSM bijwerken"
@@ -16333,7 +16396,7 @@ msgid "Strava running heatmap"
 msgstr "Strava hardlopen heatmap"
 
 msgid "Strava cycling and running heatmap"
-msgstr ""
+msgstr "Strava fietsen en hardlopen heatmap"
 
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
@@ -16384,10 +16447,10 @@ msgid "OSM Inspector: Boundaries (EU)"
 msgstr "OSM Inspector: Grenzen (EU)"
 
 msgid "IGN Argentina (WMTS)"
-msgstr ""
+msgstr "IGN Argentinië (WMTS)"
 
 msgid "IGN Argentina (WMS)"
-msgstr ""
+msgstr "IGN Argentinië (WMS)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI zwart-wit 2.5m"
@@ -16437,6 +16500,9 @@ msgstr "Tiris: DGM (Terreinmodel)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Oppervlaktemodel)"
 
+msgid "Tiris: contour lines"
+msgstr "Tiris: contourlijnen"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Wenen: Mehrzweckkarte (algemene doeleinden)"
 
@@ -16462,10 +16528,10 @@ msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: Höhen und Gelände"
 
 msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr ""
+msgstr "AGIV (Vlaanderen / Flanders) meest recente luchtfoto''s (winter)"
 
 msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr ""
+msgstr "AGIV luchtofoto''s 10cm 2013-15"
 
 msgid "URBISfr numerical imagery (2013)"
 msgstr "URBISfr numerieke afbeeldingen (2013)"
@@ -16548,8 +16614,11 @@ msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr "SDFE Overflade Skyggekort (40 cm)"
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16682,19 +16751,19 @@ msgid "Berlin aerial photograph 2015"
 msgstr "Berlijn luchtfoto''s 2015"
 
 msgid "Berlin aerial photograph 2016"
-msgstr ""
+msgstr "Berlijn luchtfoto''s 2016"
 
 msgid "Stuttgart (aerial imagery)"
 msgstr "Stuttgart (luchtfoto''s)"
 
 msgid "Erlangen aerial imagery (2016 5.0 cm)"
-msgstr ""
+msgstr "Erlangen luchtfoto''s (2016 5.0 cm)"
 
 msgid "Erlangen aerial imagery (2013 6.25 cm)"
 msgstr "Erlangen luchtfoto''s (2013 6.25 cm)"
 
 msgid "Erlangen aerial imagery (2011 5.0 cm)"
-msgstr ""
+msgstr "Erlangen luchtfoto''s (2011 5.0 cm)"
 
 msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
 msgstr ""
@@ -16730,6 +16799,9 @@ msgstr "Drone afbeeldingen 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drone-afbeeldingen Canaan(Haiti) november 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr "Drone Imagery Matthew(Haiti) oktober 2016"
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortophoto 2000"
 
@@ -17024,18 +17096,6 @@ msgstr "Freemap.sk Fietsen"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Skiën"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Stedelijke atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slowakije EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slowakije Historische kaarten"
 
@@ -17045,6 +17105,9 @@ msgstr "RABA-KGZ: Sloveens gebruik landerijen"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slovenië bebouwde gebieden"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "Kaapstad 2015 luchtfoto''s"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Zuid-Afrika CD:NGI Luchtfoto"
 
@@ -17091,10 +17154,10 @@ msgid "Stadt Zürich Luftbild 2011"
 msgstr "Stad Zürich Luchtfoto 2011"
 
 msgid "Aerial imagery canton Solothurn RGB (SOGIS 2013/2014/2015)"
-msgstr ""
+msgstr "Luchtfoto''s kanton Solothurn RGB (SOGIS 2013/2014/2015)"
 
 msgid "Aerial imagery canton Solothurn Infrared (SOGIS 2013/2014/2015)"
-msgstr ""
+msgstr "Luchtfoto''s kanton Solothurn Infrarood (SOGIS 2013/2014/2015)"
 
 msgid "Canton de Génève 5cm (SITG 2011)"
 msgstr "Kanton Génève 5cm (SITG 2011)"
@@ -17177,6 +17240,9 @@ msgstr "U.S. Forest Service roads"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Oekraïne - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Oekraïne - Kiev 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -17497,6 +17563,8 @@ msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
 msgstr ""
+"Stelt de gebruiker in staat hoeken van gebouwen te corrigeren naar 90 graden "
+"en lijnt alle gebouwen uit op de meest nabij gelegen weg."
 
 msgid "Tools for drawing buildings."
 msgstr "Programma''s voor het tekenen van gebouwen."
@@ -17579,6 +17647,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Downloaden van gegevens van OSM langs een weg"
 
+msgid "Dxf Import"
+msgstr "DXF import"
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17735,6 +17806,9 @@ msgstr ""
 "onderverzameling van verkeersstromen als het een kruising is of zoekt in een "
 "onderverzameling van verkeersstromen naar kruisingen"
 
+msgid "Tools to help import Kartverket N50"
+msgstr "Gereedschappen om Kartverket N50 helpen importeren"
+
 msgid "Helps vectorizing WMS images."
 msgstr "Helpt bij maken van vectoren in WMS-afbeeldingen."
 
@@ -17806,7 +17880,7 @@ msgstr ""
 "ervoor dat JOSM niet meer opstart, en het is moeilijk om er vanaf te komen)."
 
 msgid "Import OSM data in o5m format"
-msgstr ""
+msgstr "Gegevens van OSM importeren in indeling o5m"
 
 msgid "Convert data from Open Data portals to OSM layer"
 msgstr "Converteer gegevens vanuit portalen van Open Data naar OSM-laag"
@@ -17945,6 +18019,8 @@ msgstr "Objecten bewerken voor zeekaarten"
 msgid ""
 "Gives user more tools that facilitate aligning and rotation of buildings."
 msgstr ""
+"Geeft de gebruiker meer gereedschappen die uitlijnen en draaien van gebouwen "
+"faciliteren."
 
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -17996,6 +18072,13 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Maak rijtjeswoningen uit één enkel blok."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+"Voegt een dialoogvenster voor Nog te doen-lijst toe dat het eenvoudig maakt "
+"door lange lijsten van objecten te gaan"
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -18027,6 +18110,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Plug-in om gegevens voor OSM digitaal te ondertekenen"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr "Bewerker om tags turn lanes toe te voegen in highways"
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18077,6 +18163,8 @@ msgstr ""
 msgid ""
 "Simplifies linking OSM objects to Wikipedia articles and Wikidata items"
 msgstr ""
+"Vereenvoudigt het koppelen van objecten van OSM aan artikelen van Wikipedia "
+"en items van Wikidata"
 
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -18200,6 +18288,10 @@ msgid "No wheeled vehicle"
 msgstr "Geen voertuigen met wielen"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr "paard_rijden"
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "Sportveld"
 
@@ -18314,19 +18406,19 @@ msgstr "Elektrisch"
 
 msgctxt "electrified"
 msgid "contact_line"
-msgstr ""
+msgstr "boven_leiding"
 
 msgctxt "electrified"
 msgid "no"
-msgstr ""
+msgstr "nee"
 
 msgctxt "electrified"
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 msgctxt "electrified"
 msgid "rail"
-msgstr ""
+msgstr "spoor"
 
 msgid "Voltage in Volts (V)"
 msgstr "Voltage in Volt (V)"
@@ -19530,6 +19622,9 @@ msgstr "constructie"
 msgid "Ford"
 msgstr "Doorwaadplek"
 
+msgid "stepping_stones"
+msgstr "stapstenen"
+
 msgid "Ways"
 msgstr "Wegen"
 
@@ -20212,25 +20307,25 @@ msgid "Basin"
 msgstr "Waterbekken"
 
 msgid "retention"
-msgstr ""
+msgstr "retentie"
 
 msgid "infiltration"
-msgstr ""
+msgstr "infiltratie"
 
 msgid "detention"
-msgstr ""
+msgstr "detentie"
 
 msgid "Reservoir"
 msgstr "Reservoir"
 
 msgid "evaporator"
-msgstr ""
+msgstr "vernevelaar"
 
 msgid "tailings"
-msgstr ""
+msgstr "restwater"
 
 msgid "water_storage"
-msgstr ""
+msgstr "water_opslag"
 
 msgid "Covered Reservoir"
 msgstr "Ondergronds reservoir"
@@ -20267,10 +20362,10 @@ msgid "river"
 msgstr "rivier"
 
 msgid "lock"
-msgstr ""
+msgstr "sluis"
 
 msgid "wastewater"
-msgstr ""
+msgstr "afvalwater"
 
 msgid "Salt Water"
 msgstr "Zout water"
@@ -21172,6 +21267,9 @@ msgstr "Startbaan"
 msgid "Taxiway"
 msgstr "Taxibaan"
 
+msgid "Holding Position"
+msgstr "Opstelplaats"
+
 msgid "Helipad"
 msgstr "Heliplatform"
 
@@ -21485,7 +21583,7 @@ msgid "Water Park"
 msgstr "Zwembad"
 
 msgid "Beach Resort"
-msgstr ""
+msgstr "Strandresort"
 
 msgid "Swimming Pool"
 msgstr "Zwembad"
@@ -21844,11 +21942,11 @@ msgstr "Puntnummer"
 msgid "Point Name"
 msgstr "Naam punt"
 
-msgid "Phone Number"
-msgstr "Telefoonnummer"
+msgid "Emergency Phone Number"
+msgstr "Noodnummer"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Gebruik de landtoegangscode, b.v. +31-20-3456789)"
+msgid "(Use number as shown on plate.)"
+msgstr "(Gebruik nummer zoals weergegeven op de plaat.)"
 
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -21862,6 +21960,12 @@ msgstr "Ambulance"
 msgid "Automated Defibrillator"
 msgstr "Automatische defibrillator"
 
+msgid "Location description"
+msgstr "Beschrijving locatie"
+
+msgid "Phone Number"
+msgstr "Telefoonnummer"
+
 msgid "Located inside a building?"
 msgstr "Binnen een gebouw geplaatst?"
 
@@ -22296,7 +22400,7 @@ msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 msgid "Fitness Centre"
-msgstr ""
+msgstr "Fitnescentrum"
 
 msgid "Pitch"
 msgstr "Sportveld"
@@ -22385,7 +22489,7 @@ msgstr "sport_centrum"
 
 msgctxt "running"
 msgid "fitness_centre"
-msgstr ""
+msgstr "fitnes_centrum"
 
 msgctxt "running"
 msgid "stadium"
@@ -22445,7 +22549,7 @@ msgid "Gymnastics"
 msgstr "Turnen"
 
 msgid "fitness_centre"
-msgstr ""
+msgstr "fitnes_centrum"
 
 msgid "Ice Skating"
 msgstr "Schaatsen"
@@ -22731,6 +22835,10 @@ msgid "university"
 msgstr "universiteit"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "ziekenhuis"
 
@@ -22815,6 +22923,10 @@ msgid "public"
 msgstr "openbaar"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "ruïnes"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Niveaus"
 
@@ -23785,7 +23897,7 @@ msgid "5 Mvar"
 msgstr "5 Mvar"
 
 msgid "Power Street Cabinet"
-msgstr ""
+msgstr "straat schakelkast"
 
 msgid "Transformer Tower"
 msgstr "Transformatietoren"
@@ -24141,10 +24253,10 @@ msgid "Deli (Fine Food)"
 msgstr "Delicatessen (fijne kost)"
 
 msgid "Pastry"
-msgstr ""
+msgstr "Gebak"
 
 msgid "Confectionery"
-msgstr ""
+msgstr "Banketbakkerij"
 
 msgid "Tea"
 msgstr "Thee"
@@ -24309,13 +24421,13 @@ msgid "Hairdresser/Barber"
 msgstr "Kapper/Barbier"
 
 msgid "Female"
-msgstr ""
+msgstr "Dames"
 
 msgid "Male"
-msgstr ""
+msgstr "Heren"
 
 msgid "Unisex"
-msgstr ""
+msgstr "Unisex"
 
 msgid "Tattoo"
 msgstr "Tattooshop"
@@ -24396,10 +24508,10 @@ msgid "Vending products"
 msgstr "Producten"
 
 msgid "admission_tickets"
-msgstr ""
+msgstr "toegangs_kaarten"
 
 msgid "animal_feed"
-msgstr ""
+msgstr "dier_voeding"
 
 msgid "bicycle_tube"
 msgstr "fietsbanden"
@@ -24414,7 +24526,7 @@ msgid "drinks"
 msgstr "frisdranken"
 
 msgid "elongated_coin"
-msgstr ""
+msgstr "langwerpige_munt"
 
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
@@ -24423,7 +24535,7 @@ msgid "food"
 msgstr "voedsel"
 
 msgid "milk"
-msgstr ""
+msgstr "melk"
 
 msgid "newspapers"
 msgstr "kranten"
@@ -24432,10 +24544,10 @@ msgid "parking_tickets"
 msgstr "parkeerkaartjes"
 
 msgid "parcel_pickup"
-msgstr ""
+msgstr "ophaal_service"
 
 msgid "parcel_mail_in"
-msgstr ""
+msgstr "verzend_service"
 
 msgid "photos"
 msgstr "foto''s"
@@ -24608,16 +24720,16 @@ msgid "Government"
 msgstr "Overheid"
 
 msgid "ministry"
-msgstr ""
+msgstr "ministerie"
 
 msgid "prosecutor"
-msgstr ""
+msgstr "Openbaar Ministerie"
 
 msgid "tax"
-msgstr ""
+msgstr "belastingen"
 
 msgid "register_office"
-msgstr ""
+msgstr "kadaster"
 
 msgctxt "office"
 msgid "Insurance"
@@ -24697,7 +24809,7 @@ msgid "Winery"
 msgstr "Wijnmakerij"
 
 msgid "Hvac"
-msgstr ""
+msgstr "Installateur"
 
 msgid "Painter"
 msgstr "Schilder"
@@ -24706,7 +24818,7 @@ msgid "Stonemason"
 msgstr "Metselaar"
 
 msgid "Handicraft"
-msgstr ""
+msgstr "Handwerken"
 
 msgid "Pottery"
 msgstr "Pottenbakkerij"
@@ -24928,16 +25040,16 @@ msgid "Islet"
 msgstr "Klein eiland"
 
 msgid "Reef"
-msgstr ""
+msgstr "Rif"
 
 msgid "coral"
-msgstr ""
+msgstr "koraal"
 
 msgid "oyster"
 msgstr ""
 
 msgid "rock"
-msgstr ""
+msgstr "steen"
 
 msgid "Nature"
 msgstr "Natuur"
@@ -25026,8 +25138,14 @@ msgstr "Natuurreservaat"
 msgid "Scree"
 msgstr "Steenvlakte"
 
-msgid "An accumulation of loose rocks."
-msgstr "Een helling die bestaat uit losse stenen en puin."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "Hoog grasland"
@@ -25186,13 +25304,13 @@ msgid "Plant Nursery"
 msgstr "Plantenkwekerij"
 
 msgid "Aquaculture"
-msgstr ""
+msgstr "Watercultuur"
 
 msgid "shrimp"
-msgstr ""
+msgstr "garnalen"
 
 msgid "mussels"
-msgstr ""
+msgstr "mosselen"
 
 msgid "Allotments"
 msgstr "Volkstuinen"
@@ -25705,17 +25823,11 @@ msgstr "Routes"
 msgid "Bicycle Route"
 msgstr "Fietsroute"
 
-msgid "icn"
-msgstr "icn"
+msgid "national"
+msgstr "nationaal"
 
-msgid "ncn"
-msgstr "ncn"
-
-msgid "rcn"
-msgstr "rcn"
-
-msgid "lcn"
-msgstr "lcn"
+msgid "local"
+msgstr "lokaal"
 
 msgid "Mountain Biking Route"
 msgstr "Mountain bike-route"
@@ -25723,18 +25835,6 @@ msgstr "Mountain bike-route"
 msgid "Hiking Route"
 msgstr "Wandelroute"
 
-msgid "iwn"
-msgstr "iwn"
-
-msgid "nwn"
-msgstr "nwn"
-
-msgid "rwn"
-msgstr "rwn"
-
-msgid "lwn"
-msgstr "lwn"
-
 msgid "infrastructure"
 msgstr "infrastructuur"
 
@@ -25745,19 +25845,7 @@ msgid "Walking Route"
 msgstr "Wandelroute"
 
 msgid "Riding Route"
-msgstr ""
-
-msgid "ihn"
-msgstr "ihn"
-
-msgid "nhn"
-msgstr "nhn"
-
-msgid "rhn"
-msgstr "rhn"
-
-msgid "lhn"
-msgstr "lhn"
+msgstr "Paardrijroute"
 
 msgid "Piste Route"
 msgstr "Piste-route"
@@ -25951,9 +26039,22 @@ msgstr "Oneven huisnummer in interpolatie voor even adressen."
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr "Weg met {0}. Tag, indien mogelijk, elk huisnummer afzonderlijk."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+"Object heft geen {0}, echter, het heeft {1} en {2} welke waarden op een "
+"huisnummer lijken."
+
+msgid "Same value of {0} and {1}"
+msgstr "Dezelfde waarde voor {0} en {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} zonder {1}"
 
+msgid "missing tag"
+msgstr "ontbrekende tag"
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} zonder {1} of {2}"
 
@@ -25963,6 +26064,12 @@ msgstr "{0} zonder {1}, {2} of {3}"
 msgid "{0} together with {1}"
 msgstr "{0} samen met {1}"
 
+msgid "suspicious tag combination"
+msgstr "onwaarschijnlijke tagcombinatie"
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr "twee objecten, een met {0} en en met {1} + {2} + {3}"
+
 msgid "incomplete object: only {0}"
 msgstr "incompleet object: alleen {0}"
 
@@ -25978,39 +26085,24 @@ msgstr "{0} samen met {1} en conflicterende waarden"
 msgid "{0} on suspicious object"
 msgstr "{0} op verdacht object"
 
-msgid "restaurant without name"
-msgstr "restaurant zonder naam"
-
-msgid "{0} used with {1}"
-msgstr "{0} gebruikt met {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "natuurlijk water gebruikt als zwembad"
 
 msgid "sport without physical feature"
 msgstr "sport zonder fysiek object"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} zou op de node moeten zijn waar {1} en {2} kruisen"
-
 msgid "alternative name without {0}"
-msgstr "alternatiev naam zonder {0}"
+msgstr "alternatieve naam zonder {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "onvolledig gebruik van {0} op een weg zonder {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Dezelfde waarde voor {0} en {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Dezelfde waarde voor {0}, {1} en {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} en {1} samen met {2} en conflicterende waarden"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Verdachte tagcombinatie: {0} en {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} op een relatie zonder {1}"
 
@@ -26033,11 +26125,20 @@ msgstr ""
 "Controleer ook kruisende bruggen en hun {1} tags."
 
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
-msgstr ""
+msgstr "{0} samen met {1} en {2}. Verwijder {1} en {2}"
+
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Verschillend aantal lanes in de sleutels {0} en {1}"
+
+msgid "possibly missing {0} tag"
+msgstr "mogelijk ontbrekende {0} tag"
 
 msgid "{0} is deprecated"
 msgstr "{0} is vervallen"
 
+msgid "deprecated tagging"
+msgstr "vervallen tags"
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' is zonder betekenis, gebruik meer specifieke tags, bijv. ''{1}''"
@@ -26108,12 +26209,18 @@ msgstr "Niet specifieke tag {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Definitie van {0} is niet helder"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} wordt niet aanbevolen. Gebruik de functie Wegen omkeren uit het menu "
 "Gereedschappen."
 
+msgid "{0}"
+msgstr "{0}"
+
 msgid "key with uncommon character"
 msgstr "sleutel met niet algemeen teken"
 
@@ -26131,8 +26238,8 @@ msgstr ""
 "{0} is vervallen. Gebruik het voorvoegsel voor de sleutel {1}:  in plaats "
 "daarvan."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "onwaarschijnlijke sleutel (eindigt op ene getal): {0}"
+msgid "questionable key (ending with a number)"
+msgstr "onwaarschijnlijke sleutel (eindigt op een getal)"
 
 msgid "The key {0} has an uncommon value."
 msgstr "De sleutel {0} heeft een ongewone waarde."
@@ -26176,8 +26283,8 @@ msgstr "Overlappende identieke natuurlijke gebieden"
 msgid "Overlapping Identical Landuses"
 msgstr "Overlappende identieke Landuses"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} moet worden verbonden aan een weg"
+msgid "isolated node which must be connected to a way"
+msgstr "geïsoleerde knoop die zou moeten zijn verbonden aan een weg"
 
 msgid "node connects waterway and bridge"
 msgstr "knoop verbindt waterweg en brug"
@@ -26214,6 +26321,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Kustlijn binnen {1}"
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} zou op de node moeten zijn waar {1} en {2} kruisen"
+
 msgid "abbreviated street name"
 msgstr "afgekorte straatnaam"
 
@@ -26232,6 +26342,9 @@ msgstr "verkeersweg zonder een referentie"
 msgid "temporary highway type"
 msgstr "type tijdelijke verkeersweg"
 
+msgid "{0} used with {1}"
+msgstr "{0} gebruikt met {1}"
+
 msgid "street name contains ss"
 msgstr "straatnaam bevat ss"
 
@@ -26334,11 +26447,14 @@ msgstr "onbekende joodse omschrijving"
 msgid "{0} is unnecessary"
 msgstr "{0} is niet nodig"
 
+msgid "unnecessary tag"
+msgstr "onnodige tag"
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} is niet nodig voor {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} is niet logisch"
+msgid "{0} makes no sense"
+msgstr "{0} lijkt niet zinnig"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Knopen die tags voor \"ouder\"-weg dupliceren"
@@ -26604,6 +26720,27 @@ msgstr "GPX-spoor uploaden"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Sporen uploaden naar openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Aan het importeren..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr "DXF-bestanden [plug-in ImportDxf] (*.dxf)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Open of maak een gegevenslaag vóór het importeren"
+
+msgid "Import dxf"
+msgstr "Import DXF"
+
+msgid "Scale:"
+msgstr "Schaal:"
+
+msgid "unit(s) = "
+msgstr "eenhe(i)d(en) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Geeft hoogteprofiel weer"
 
@@ -26959,6 +27096,406 @@ 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 "Total images:"
+msgstr "Totaal aantal afbeeldingen:"
+
+msgid "images"
+msgstr "afbeeldingen"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "Lettertype van verkeersteken op ''{0}'' heeft verkeerde opmaak"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Kon bestand voor lettertype niet lezen vanaf ''{0}''"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Laag voor Mapillary maken"
+
+msgid "Start Mapillary layer"
+msgstr "Laag voor Mapillary beginnen"
+
+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 "Select pictures"
+msgstr "Afbeeldingen selecteren"
+
+msgid "Import pictures into sequence"
+msgstr "Afbeeldingen in reeks importeren"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Afbeeldingen in een reeks naar een laag van Mapillary importeren"
+
+msgid "Join mode"
+msgstr "Modus Samenvoegen"
+
+msgid "Join/unjoin pictures"
+msgstr "Afbeeldingen samenvoegen/van elkaar losmaken"
+
+msgid "Join Mapillary pictures"
+msgstr "Afbeeldingen van Mapillary samenvoegen"
+
+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 "Upload pictures"
+msgstr "Afbeeldingen uploaden"
+
+msgid "Upload Mapillary pictures"
+msgstr "Afbeeldingen van Mapillary uploaden"
+
+msgid "Upload pictures."
+msgstr "Afbeeldingen uploaden."
+
+msgid "Walk mode"
+msgstr "Modus Wandeling"
+
+msgid "Start walk mode"
+msgstr "Modus Wandeling starten"
+
+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 "View in website"
+msgstr "In website bekijken"
+
+msgid "Copy key"
+msgstr "Sleutel kopiëren"
+
+msgid "Copy key tag"
+msgstr "Sleutel van tag kopiëren"
+
+msgid "Edit on website"
+msgstr "Op website bewerken"
+
+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 "Submit"
+msgstr "Indienen"
+
+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 folder"
+msgstr "Selecteer een map"
+
+msgid "Explore"
+msgstr "Verkennen"
+
+msgid "Select a directory"
+msgstr "Selecteer een map"
+
+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 "Mapillary picture"
+msgstr "afbeelding van Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Venster van Mapillary openen"
+
+msgid "Mapillary dialog"
+msgstr "dialoogvenster Mapillary"
+
+msgid "Open Mapillary main dialog"
+msgstr "Hoofddialoogvenster 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 "Login"
+msgstr "Inloggen"
+
+msgid "Logout"
+msgstr "Uitloggen"
+
+msgid "Download mode"
+msgstr "Modus Downloaden"
+
+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 "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 "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 "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 downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+"Het gedownloade gebied van OSM is te groot. Modus Downloaden is gewijzigd "
+"naar het gebied van OSM totdat de laag opnieuw wordt gestart."
+
+msgid "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 "The image key ''{0}'' is invalid!"
+msgstr "De afbeeldingssleutel ''{0}'' is ongeldig!"
+
+msgid "The image key must not be null here!"
+msgstr "De sleutel voor de afbeelding mag hier niet null zijn!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "De sleutel voor de reeks ''{0}'' is ongeldig!"
+
+msgid "The sequence key must not be null here!"
+msgstr "De sleutel voor de reeks mag hier geen null zijn!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -27710,19 +28247,22 @@ msgid "Debugging mode will write images for each processing step."
 msgstr "Modus Foutopsporing zal afbeeldingen schrijven voor elke processtap"
 
 msgid "Building Generalization"
-msgstr ""
+msgstr "Veralgemeniseren van gebouwen"
 
 msgid ""
 "Beginners draw outlines often very inaccurate. Such buildings shall be "
 "converted to rectangular ones. Angles between 84-96 degrees are converted to "
 "90 degrees."
 msgstr ""
+"Beginners tekenen omtrekken vaak niet nauwkeurig. Dergelijke gebouwen zullen "
+"worden geconverteerd naar rechthoekige. Hoeken tussen 84-96 garden worden "
+"geconverteerd naar 90 graden."
 
 msgid "There is no frame loaded !"
-msgstr ""
+msgstr "Er is geen frame geladen !"
 
 msgid "Alert Message"
-msgstr ""
+msgstr "Waarschuwingsbericht"
 
 msgid "Street Name:"
 msgstr "Straatnaam:"
@@ -28834,9 +29374,6 @@ 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"
 
@@ -28869,9 +29406,6 @@ msgstr "Privé chatten"
 msgid "Close tab"
 msgstr "Tabblad sluiten"
 
-msgid "Logout"
-msgstr "Uitloggen"
-
 msgid "Clear log"
 msgstr "Log wissen"
 
@@ -29463,9 +29997,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29660,21 +30191,9 @@ msgstr "Geïmporteerde afbeeldingen"
 msgid "Import vector graphics"
 msgstr "Vectorafbeeldingen importeren"
 
-msgid "Scale:"
-msgstr "Schaal:"
-
-msgid "unit(s) = "
-msgstr "eenhe(i)d(en) = "
-
-msgid "Importing..."
-msgstr "Aan het importeren..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVG-bestanden [ImportVec plugin] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Open of maak een gegevenslaag vóór het importeren"
-
 msgid "Concourse wizard ..."
 msgstr "Assistent wachtruimte ..."
 
@@ -29862,7 +30381,7 @@ msgid "Check "
 msgstr "Controleer "
 
 msgid "check the subset for junction properties"
-msgstr ""
+msgstr "controleer de subset op eigenschappen van kruisingen"
 
 msgid "Search "
 msgstr "Zoeken "
@@ -29893,6 +30412,65 @@ msgstr "Aantal gevonden {0}-wegs kruisingen: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "Genereer alle combinaties uit ingang/uitgang-kandidaten"
 
+msgid "Check the direction"
+msgstr "Controleer de richting"
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+"Controleer de richting van de geselecteerde stroom/rivier. Is die juist?\n"
+"Voortgang: "
+
+msgid "Correct"
+msgstr "Juist"
+
+msgid "Wrong"
+msgstr "Fout"
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr "<HTML><U>J</U>uiste richting</HTML>"
+
+msgid "Direction of river is correct."
+msgstr "De richting van de rivier is juist."
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr "<HTML><U>F</U>oute richting</HTML>"
+
+msgid "Direction of river is wrong."
+msgstr "De richting van de rivier is niet juist."
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr "<HTML><U>N</U>egeer deze weg</HTML>"
+
+msgid "Ignore direction of this way."
+msgstr "Richting van deze weg negeren."
+
+msgid "Check direction of streams"
+msgstr "Controleer richting van stromen"
+
+msgid "Check direction of streams and rivers"
+msgstr "Controleer richting van stromen en rivieren"
+
+msgid "No more directions to check!"
+msgstr "Geen richtingen meer te controleren!"
+
+msgid "Replace way"
+msgstr "Weg vervangen"
+
+msgid "Replace way of selected way with a new way"
+msgstr "Vervang weg van geselecteerde weg door een nieuwe weg"
+
+msgid "Replace Geometry"
+msgstr "Geometrie vervangen"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+"Dit gereedschap vervangt de kustlijn vanéén weg door een andere en vereist "
+"dus dat exact twee wegen kustlijn zijn geselecteerd."
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Richtingsindex ''{0}'' niet gevonden"
 
@@ -30149,403 +30727,6 @@ msgstr "Activeert de plug-in voor melden van problemen van MapDust"
 msgid "Missing input data"
 msgstr "Ontbrekende gegevens invoer"
 
-msgid "Mapillary Images"
-msgstr "Afbeeldingen van Mapillary"
-
-msgid "Mapillary layer"
-msgstr "laag van Mapillary"
-
-msgid "Total images:"
-msgstr "Totaal aantal afbeeldingen:"
-
-msgid "images"
-msgstr "afbeeldingen"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr "Lettertype van verkeersteken op ''{0}'' heeft verkeerde opmaak"
-
-msgid "Could not read font-file from ''{0}''"
-msgstr "Kon bestand voor lettertype niet lezen vanaf ''{0}''"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Laag voor Mapillary maken"
-
-msgid "Start Mapillary layer"
-msgstr "Laag voor Mapillary beginnen"
-
-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 "Select pictures"
-msgstr "Afbeeldingen selecteren"
-
-msgid "Import pictures into sequence"
-msgstr "Afbeeldingen in reeks importeren"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Afbeeldingen in een reeks naar een laag van Mapillary importeren"
-
-msgid "Join mode"
-msgstr "Modus Samenvoegen"
-
-msgid "Join/unjoin pictures"
-msgstr "Afbeeldingen samenvoegen/van elkaar losmaken"
-
-msgid "Join Mapillary pictures"
-msgstr "Afbeeldingen van Mapillary samenvoegen"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr "Afbeeldingen uploaden"
-
-msgid "Upload Mapillary pictures"
-msgstr "Afbeeldingen van Mapillary uploaden"
-
-msgid "Upload pictures."
-msgstr "Afbeeldingen uploaden."
-
-msgid "Walk mode"
-msgstr "Modus Wandeling"
-
-msgid "Start walk mode"
-msgstr "Modus Wandeling starten"
-
-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 "Uploaded {0} images"
-msgstr "{0} afbeeldingen geüpload"
-
-msgid "Approve upload on the website"
-msgstr "Uploaden naar de website toestaan"
-
-msgid "View in website"
-msgstr "In website bekijken"
-
-msgid "Copy key"
-msgstr "Sleutel kopiëren"
-
-msgid "Copy key tag"
-msgstr "Sleutel van tag kopiëren"
-
-msgid "Edit on website"
-msgstr "Op website bewerken"
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-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 folder"
-msgstr "Selecteer een map"
-
-msgid "Explore"
-msgstr "Verkennen"
-
-msgid "Select a directory"
-msgstr "Selecteer een map"
-
-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 "Mapillary picture"
-msgstr "afbeelding van Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Venster van Mapillary openen"
-
-msgid "Mapillary dialog"
-msgstr "dialoogvenster Mapillary"
-
-msgid "Open Mapillary main dialog"
-msgstr "Hoofddialoogvenster 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 "Download mode"
-msgstr "Modus Downloaden"
-
-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 "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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"Het te downloaden gebied van OSM is te groot. Modus Downloaden is gewijzigd "
-"naar semiautomatisch totdat de laag opnieuw is gestart."
-
-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 ""
-
-msgid "No images found"
-msgstr "Geen afbeeldingen gevonden"
-
-msgid "Finished upload"
-msgstr "Uploaden voltooid"
-
-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 "Uploaden: {0}"
-
-msgid "The image key ''{0}'' is invalid!"
-msgstr "De afbeeldingssleutel ''{0}'' is ongeldig!"
-
-msgid "The image key must not be null here!"
-msgstr "De sleutel voor de afbeelding mag hier niet null zijn!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "De sleutel voor de reeks ''{0}'' is ongeldig!"
-
-msgid "The sequence key must not be null here!"
-msgstr "De sleutel voor de reeks mag hier geen null zijn!"
-
 msgid "Measured values"
 msgstr "Gemeten waarden"
 
@@ -30758,7 +30939,7 @@ msgstr ""
 "uit {0}.)"
 
 msgid "OSM Server Files o5m compressed"
-msgstr ""
+msgstr "OSM Server Files o5m gecomprimeerd"
 
 msgid "Invalid changeset id: {0}"
 msgstr "Ongeldige wijzigingenset-ID: {0}"
@@ -30767,10 +30948,10 @@ msgid "Invalid timestamp: {0}"
 msgstr "Ongeldige tijdstempel: {0}"
 
 msgid "wrong header byte "
-msgstr ""
+msgstr "verkeerde header byte "
 
 msgid "unsupported header"
-msgstr ""
+msgstr "niet ondersteunde header"
 
 msgid "Reading OSM data..."
 msgstr "OSM-gegevens inlezen..."
@@ -31981,13 +32162,13 @@ msgid "Printing has failed."
 msgstr "Afdrukken is mislukt."
 
 msgid "Add stop position"
-msgstr ""
+msgstr "Haltepositie toevoegen"
 
 msgid "Repeat last fix"
-msgstr ""
+msgstr "Laatste reparatie herhalen"
 
 msgid "Do you want to download referrers of platforms and stop positions?"
-msgstr ""
+msgstr "Wilt u verwijzingen naar platformen halteposities downloaden?"
 
 msgid "Remember my choice and do not ask me again in this session"
 msgstr "Onthoud mijn keuze en vraag me dat in deze sessie niet meer"
@@ -32005,10 +32186,10 @@ msgstr ""
 "Wilt u ze downloaden?"
 
 msgid "Download incomplete route relation members"
-msgstr ""
+msgstr "Niet volledige leden van routrelatie downloaden"
 
 msgid "Include stop_area tests"
-msgstr ""
+msgstr "Testen stop_area opnemen"
 
 msgid "PT_Assistant plugin found that this relation (id={0}) has errors:"
 msgstr "Plug-in PT_Assistant vindt dat deze relatie (id={0}) fouten heeft:"
@@ -32030,16 +32211,17 @@ msgid "PT_Assistant Proceed Request"
 msgstr "Verzoek door te gaan met PT_Assistant"
 
 msgid "PT: Stop_position is not part of a way"
-msgstr ""
+msgstr "PT: Halte_positie is geen deel van een weg"
 
 msgid "PT: Platform should not be part of a way"
-msgstr ""
+msgstr "PT: Platform zou geen deel van een weg moeten zijn"
 
 msgid "PT: Stop position or platform is not part of a stop area relation"
 msgstr ""
+"PT: Haltepositie of platform is geen deel van een relatie haltegebied"
 
 msgid "PT_Assistant Message"
-msgstr ""
+msgstr "PT_Assistant bericht"
 
 msgid "Public Transport Assistant tests"
 msgstr "Testen Assistent openbaar vervoer"
@@ -32068,43 +32250,55 @@ msgid "PT: First or last way needs to be split"
 msgstr "PT: Eerste of laatste weg zou moeten wordne gesplitst"
 
 msgid "PT: Problem in the route segment"
-msgstr ""
+msgstr "PT: Probleem in het segment van de route"
 
 msgid "PT: Stop not served"
-msgstr ""
+msgstr "PT: Halte niet in service"
 
 msgid "PT: Problem in the route segment with no automatic fix"
 msgstr ""
+"PT: Probleem in het segment van de route zonder automatisch repareren"
 
 msgid "PT: Problem in the route segment with one automatic fix"
 msgstr ""
+"PT: Probleem in het segment van de route segment met één automatische "
+"reparatie"
 
 msgid "Warning: the diplayed fix variants are based on less strict criteria"
 msgstr ""
+"Waarschuwing: de weergegeven varianten voor het repareren zijn gebaseerd op "
+"minder strikte criteria"
 
 msgid "Type letter to select the fix variant or press Escape for no fix"
 msgstr ""
+"Typ letter om de variant voor de reparatie te selecteren of druk op Escape "
+"om niet te repareren"
 
 msgid "PT: Stop area relation has no stop position"
-msgstr ""
+msgstr "PT: Relatie haltegebied heeft geen haltepositie"
 
 msgid "PT: Stop area relation has no platform"
-msgstr ""
+msgstr "PT: Relatie haltegbied heeft geen platform"
 
 msgid ""
 "PT: Route relations of stop position(s) and platform(s) of stop area members "
 "diverge"
 msgstr ""
+"PT: Routerelaties van haltepositie(s) en platform(en) van leden haltegebied "
+"verschillen"
 
 msgid "PT: Route type does not match the type of the road it passes on"
 msgstr ""
 "PT: Type route komt niet overeen met het type weg waar het overheen gaat"
 
 msgid "PT: Road is under construction"
-msgstr ""
+msgstr "PT: Aan de weg wordt gewerkt"
 
 msgid "PT: Route passes a oneway road in the wrong direction"
-msgstr ""
+msgstr "PT: Route passeeert een éénrichting-weg in de verkeerde richting"
+
+msgid "moved"
+msgstr "verplaatst"
 
 msgid "rail"
 msgstr "spoor"
@@ -32203,9 +32397,6 @@ msgstr "Vangen"
 msgid "Join"
 msgstr "Verbinden"
 
-msgid "moved"
-msgstr "verplaatst"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Openbaar vervoer: GTFS-haltes verbinden"
 
@@ -32918,49 +33109,49 @@ msgid "Select a map object"
 msgstr "Een kaartobject selecteren"
 
 msgid "Shape actions panel"
-msgstr ""
+msgstr "Paneel Acties voor vormen"
 
 msgid "Shape mode control panel"
-msgstr ""
+msgstr "Paneel Modus beheren vorm"
 
 msgid "Rotate Mode:"
-msgstr ""
+msgstr "Modus Roteren:"
 
 msgid "Clockwise"
-msgstr ""
+msgstr "Met de klok mee"
 
 msgid "Counter Clockwise"
-msgstr ""
+msgstr "Tegen de klok in"
 
 msgid "Input angle here"
-msgstr ""
+msgstr "Invoer hoek hier"
 
 msgid "Rotate"
-msgstr ""
+msgstr "Draaien"
 
 msgid "Align building "
-msgstr ""
+msgstr "Gebouw uitlijnen "
 
 msgid "Select building"
-msgstr ""
+msgstr "Gebouw selecteren"
 
 msgid "Select road"
-msgstr ""
+msgstr "Weg selecteren"
 
 msgid "Select none"
-msgstr ""
+msgstr "Niets selecteren"
 
 msgid "Min Distance:"
-msgstr ""
+msgstr "Minimale afstand:"
 
 msgid "Input min distance"
-msgstr ""
+msgstr "Minimale afstand invoeren"
 
 msgid "Align all buildings"
-msgstr ""
+msgstr "Alle gebouwen uitlijnen"
 
 msgid "Delete overlay"
-msgstr ""
+msgstr "Overlay verwijderen"
 
 msgid "Simplify Area"
 msgstr "Gebied vereenvoudigen"
@@ -33271,6 +33462,76 @@ msgstr ""
 msgid "Terrace"
 msgstr "Rijtjeshuizen"
 
+msgid "Pass over element without marking it"
+msgstr "Ga over het element zonde rhet te markeren"
+
+msgid "Mark element done"
+msgstr "Element als voltooid markeren"
+
+msgid "Todo list"
+msgstr "Lijst Nog te doen"
+
+msgid "Open the todo list."
+msgstr "De lijst Nog te doen openen."
+
+msgid "Zoom to the selected item in the todo list."
+msgstr "Naar het gesleecteerde item in de lijst Nog te doen zoomen."
+
+msgid "Select all Unmarked and Zoom"
+msgstr "Alle niet gemarkeerde selecteren en zoomen"
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+"Alle niet gemarkeerde items van de lijst Nog te doen selecteren en zoomen."
+
+msgid "Pass"
+msgstr "Overslaan"
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+"Verplaatst naar het volgende item maar laat dit item in de lijst Nog te "
+"doen. ([)."
+
+msgid "Add the selected items to the todo list."
+msgstr "De geselecteerde items aan de list Nog te doen toevoegen."
+
+msgid "Mark selected"
+msgstr "Als geselecteerd markeren"
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+"De geselecteerde items (op de kaart) als verwerkt in de lijst Nog te doen "
+"markeren."
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+"Het geselecteerde item in de lijst Nog te doen als verwerkt markeren. (])."
+
+msgid "Mark all"
+msgstr "Alles markeren"
+
+msgid "Mark all items in the todo list as done."
+msgstr "Alle items in de lijst Nog te doen als verwerkt markeren."
+
+msgid "Unmark all"
+msgstr "Alle markeringen opheffen"
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+"Markeren van alle items in de Lijst Nog te doen die zijn gemarkeerd als "
+"verwerkt opheffen."
+
+msgid "Clear the todo list"
+msgstr "Maak de lijst Nog te doen leeg"
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+"Alle items (gemarkeerd en niet gemarkeerd) uit de lijst Nog te doen "
+"verwijderen."
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr "Lijst Nog te doen {0}/{1} ({2}%)"
+
 msgid "To-fix"
 msgstr "Te repareren"
 
@@ -33354,7 +33615,7 @@ msgid "No change to upload!"
 msgstr "Geen wijziging om te uploaden!"
 
 msgid "The bounding box is too big."
-msgstr ""
+msgstr "Het begrenzingsvak is te groot."
 
 msgid "Cannot place a node outside of the world."
 msgstr "Kan geen knoop buiten de wereld plaatsen."
@@ -33756,6 +34017,89 @@ msgstr "Kies een vervaldatum voor de sleutel:"
 msgid "Create a new signing key"
 msgstr "Maak een nieuwe sleutel voor ondertekening"
 
+msgid "Turn lanes tagging - editor"
+msgstr "Afslagen taggen - bewerker"
+
+msgid "Turn lanes tagging - Editor"
+msgstr "Afslagen taggen - Bewerker"
+
+msgid "turn lanes tagging - editor"
+msgstr "afslagen taggen - bewerker"
+
+msgid "Turn Lanes Editor"
+msgstr "Bewerker Afslagen taggen"
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr " Het aantal rijstroken is gerepareerd overeenkomstig aantal afslagen"
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+" Het aantal rijstroken:vooruit heeft gerepareerd overeenkomstig aantal "
+"afslagen"
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+" Het aantal rijstroken:beide_richtingen heeft gerepareerd overeenkomstig "
+"aantal afslagen"
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+" Het aantal rijstroken:terug heeft gerepareerd overeenkomstig aantal afslagen"
+
+msgid "check the right direction of the way"
+msgstr "controleer de juiste richting van de weg"
+
+msgid "Unidirectional road"
+msgstr "Weg met één richting"
+
+msgid "Build unidirectional road"
+msgstr "Bouw weg met één richting"
+
+msgid "Bidirectional road"
+msgstr "Weg met twee richtingen"
+
+msgid "Build bidirectional road"
+msgstr "Bouw weg met twee richtingen"
+
+msgid "Use \"none\""
+msgstr "\"niets\" gebruiken"
+
+msgid "use \"none\" instead of empty values"
+msgstr "\"niets\" gebruiken in plaats van lege waarden"
+
+msgid "Preset turn lanes"
+msgstr "Voorkeuze afslagen"
+
+msgid "Recently turn lanes edits"
+msgstr "Recente bewerkingen afslagen"
+
+msgid "Forward"
+msgstr "Vooruit"
+
+msgid "Both way lane"
+msgstr "Rijstrook in twee richtingen"
+
+msgid "Backward"
+msgstr "Terug"
+
+msgid "Number of backward lanes"
+msgstr "Aantal rijstroken terug"
+
+msgid "Number of forward lanes"
+msgstr "Aantal rijstroken vooruit"
+
+msgid "Both way"
+msgstr "Beide richtingen"
+
+msgid "Number of lanes"
+msgstr "Aantal rijstroken"
+
+msgid "Directional"
+msgstr "Richting"
+
+msgid "Turn lanes"
+msgstr "Afslagen"
+
 msgid "No such lane."
 msgstr "Rijstrook bestaat niet."
 
@@ -34739,9 +35083,6 @@ msgstr "Primitieven met deze tags zoeken"
 msgid "Multitag Background: highlight"
 msgstr "Achtergrond multitags: accentueren"
 
-msgid "Replace Geometry"
-msgstr "Geometrie vervangen"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Geometrie van een geselecteerd object vervangen door een nieuwe"
 
@@ -34957,15 +35298,9 @@ msgstr "start/pauzeert het afspelen van de video"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "Terug"
-
 msgid "jumps n sec back"
 msgstr "springt n sec terug"
 
-msgid "Forward"
-msgstr "Vooruit"
-
 msgid "jumps n sec forward"
 msgstr "springt n sec vooruit"
 
@@ -35204,16 +35539,16 @@ msgstr[0] "Overschrijf ''{0}'' tag {1} van {2} met nieuwe waarde ''{3}''?"
 msgstr[1] "Overschrijf ''{0}'' tags {1} van {2} met nieuwe waarde ''{3}''?"
 
 msgid "Search Wikidata items"
-msgstr ""
+msgstr "Zoeken in items van Wikidata"
 
 msgid "Target key: "
-msgstr ""
+msgstr "Doel sleutel: "
 
 msgid "Search Wikipedia category"
-msgstr ""
+msgstr "Zoeken in categorie van Wikipedia"
 
 msgid "Load category"
-msgstr ""
+msgstr "Categorie laden"
 
 msgid "Fetch Wikipedia articles with coordinates"
 msgstr "Haal artikelen van Wikipedia op met coördinaten"
@@ -35235,13 +35570,13 @@ msgid "Not linked yet"
 msgstr "Nog niet gekoppeld"
 
 msgid "{0}: {1}"
-msgstr ""
+msgstr "{0}: {1}"
 
 msgid "Wikidata"
-msgstr ""
+msgstr "Wikidata"
 
 msgid "Fetches all coordinates from Wikidata in the current view"
-msgstr ""
+msgstr "Haalt alle coördinaten van Wikidata in de huidige weergave op"
 
 msgid "Fetches all coordinates from Wikipedia in the current view"
 msgstr "Haalt alle coördinaten van Wikipedia op voor de huidige weergave"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index 5dd9452..f989e4b 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:17+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:59+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: nn\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Feil"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Feil"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index 54bfee4..d88712e 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:18+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:01+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -207,28 +207,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Apondre lo calc d’imatjariá {0}"
 
-msgid "Error"
-msgstr "Error"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Error"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3285,9 +3285,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3689,10 +3686,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3729,6 +3726,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3738,6 +3738,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3774,6 +3777,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3992,6 +4001,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4202,30 +4217,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4469,9 +4484,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4992,9 +5004,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6414,6 +6423,9 @@ msgstr ""
 msgid "Sort"
 msgstr "Triar"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tipe d’objècte :"
 
@@ -6653,6 +6665,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7925,9 +7945,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8491,6 +8508,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8542,6 +8562,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8554,6 +8580,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10609,6 +10641,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12690,6 +12725,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13052,6 +13090,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14695,6 +14736,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14806,7 +14850,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14985,6 +15032,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15279,18 +15329,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15300,6 +15338,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15432,6 +15473,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15799,6 +15843,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15913,6 +15960,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16110,6 +16160,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16132,6 +16187,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16288,6 +16346,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17608,6 +17670,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19227,6 +19292,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19897,10 +19965,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19915,6 +19983,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20784,6 +20858,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20868,6 +20946,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23073,7 +23155,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23740,16 +23828,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23758,18 +23840,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23782,18 +23852,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23986,9 +24044,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23998,6 +24067,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24013,39 +24088,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24064,9 +24124,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24121,10 +24190,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24140,7 +24215,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24185,7 +24260,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24219,6 +24294,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24237,6 +24315,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24327,10 +24408,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24576,6 +24660,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24914,3267 +25019,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29636,6 +29778,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29731,9 +29876,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30745,6 +30887,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31192,6 +31394,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32018,9 +32298,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32214,15 +32491,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index 6c84cb4..38e9a8b 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2011-05-06 15:52+0000\n"
 "Last-Translator: A S Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi <pa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:19+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:01+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: pa\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index 66b79e6..3c2ce6d 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -8,17 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-25 07:06+0000\n"
-"Last-Translator: Piotr Sokół <Unknown>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-10-06 21:24+0000\n"
+"Last-Translator: Daniel Koć <daniel at xn--ko-wla.pl>\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: 2016-09-06 05:21+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:03+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: pl\n"
 "X-Poedit-Bookmarks: 1098,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n\n"
@@ -215,7 +215,7 @@ msgid "No target layers"
 msgstr "Brak warstw docelowych."
 
 msgid "Select"
-msgstr "Zaznaczanie"
+msgstr "Zaznacz"
 
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -224,18 +224,6 @@ msgstr "Zaznacza na mapie elementy wskazane na powyższej liście"
 msgid "Add imagery layer {0}"
 msgstr "Dodaje warstwę podkładu {0}"
 
-msgid "Error"
-msgstr "Błąd"
-
-msgid "Select image format for WMS layer"
-msgstr "Wybierz format obrazu dla warsty WMS"
-
-msgid "Select WMS layers"
-msgstr "Wybierz warstwy WMS"
-
-msgid "Add layers"
-msgstr "Dodaj warstwy"
-
 msgid "Invalid service URL."
 msgstr "Niepoprawny adres usługi"
 
@@ -248,6 +236,18 @@ msgstr "Nie udało się pobrać listy warstw"
 msgid "Could not parse WMS layer list."
 msgstr "Nie udało się sparsować listy warstw"
 
+msgid "Error"
+msgstr "Błąd"
+
+msgid "Select image format for WMS layer"
+msgstr "Wybierz format obrazu dla warsty WMS"
+
+msgid "Select WMS layers"
+msgstr "Wybierz warstwy WMS"
+
+msgid "Add layers"
+msgstr "Dodaj warstwy"
+
 msgid "Add Node..."
 msgstr "Dodaj węzeł..."
 
@@ -1909,7 +1909,7 @@ msgid "({0}/{1}) Downloading changeset {2}..."
 msgstr "({0}/{1}) Pobieranie zestawu zmian {2}..."
 
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Pobieranie zawarości dla zestawu zmian {2}..."
+msgstr "({0}/{1}) Pobieranie zawartości dla zestawu zmian {2}..."
 
 msgid "Download changesets"
 msgstr "Pobierz zestawy zmian"
@@ -3624,9 +3624,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Brak zdefiniowanych warstw w dokumencie getCapabilities: {0}"
 
-msgid "No layer selected"
-msgstr "Nie wybrano warstwy"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3980,7 +3977,7 @@ msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
 msgstr ""
 
 msgid "Sinusoidal"
-msgstr ""
+msgstr "Sinusoidalne"
 
 msgid "Swiss Oblique Mercator"
 msgstr "Szwajcarskie odwzorowanie Merkatora"
@@ -4052,12 +4049,12 @@ msgstr "Wielokrotne relacje associatedStreet"
 msgid "House number without street"
 msgstr "Numer domu bez nazwy ulicy"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Numer domu „{0}'' zduplikowany"
-
 msgid "Duplicate house numbers"
 msgstr "Zduplikowane numery domów"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Numer domu „{0}'' zduplikowany"
+
 msgid "Multiple street names in relation"
 msgstr "Wiele nazw ulic w relacji"
 
@@ -4096,6 +4093,9 @@ msgstr "Linie brzegowe"
 msgid "This test checks that coastlines are correct."
 msgstr "Ten test sprawdza czy linie brzegowe są poprawne."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Odwrócona linia wybrzeża: ląd nie znajduje się po lewej stronie"
+
 msgid "Unconnected coastline"
 msgstr "Niepołączona linia brzegowa"
 
@@ -4105,6 +4105,9 @@ msgstr "Nieuporządkowana linia brzegowa"
 msgid "Reversed coastline"
 msgstr "Odwrócona linia brzegowa"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "Klucze Warunkowe"
 
@@ -4141,6 +4144,12 @@ msgstr "Przecinające się granice"
 msgid "Crossing barriers"
 msgstr "Przecinające się przeszkody"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4374,6 +4383,12 @@ msgstr "Składnik wielokąta złożonego nie ma przypisanej roli"
 msgid "Non-Way in multipolygon"
 msgstr "Wielokąt złożony zawiera obiekt niebędący linią"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Brakujące tłumaczenie tagów name:*"
 
@@ -4597,30 +4612,30 @@ msgstr "Wartości podmiotu zawiera wiele spacji"
 msgid "Property values contain HTML entity"
 msgstr "Wartość zawiera kody HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Klucz „{0}'' wygląda jak „{1}”."
-
 msgid "Misspelled property key"
 msgstr "Błędny klucz podmiotu"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Klucz „{0}” nie występuje w szablonach"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Klucz „{0}'' wygląda jak „{1}”."
 
 msgid "Presets do not contain property key"
 msgstr "Szablony nie zawierają danego klucza"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Wartość „{0}'' dla klucza „{1}” przypomina „{2}”."
+msgid "Key ''{0}'' not in presets."
+msgstr "Klucz „{0}” nie występuje w szablonach"
 
 msgid "Misspelled property value"
 msgstr "Literówka w podanej wartości"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Wartość „{0}” dla klucza „{1}” nie występuje w szablonach."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Wartość „{0}'' dla klucza „{1}” przypomina „{2}”."
 
 msgid "Presets do not contain property value"
 msgstr "Szablony nie zawierają danej wartości"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Wartość „{0}” dla klucza „{1}” nie występuje w szablonach."
+
 msgid "FIXMES"
 msgstr "DO POPRAWKI"
 
@@ -4869,9 +4884,6 @@ msgstr ""
 "Ten test sprawdza kierunek dróg wodnych (waterway), lądu (land) i wybrzeża "
 "(coastline)."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Odwrócona linia wybrzeża: ląd nie znajduje się po lewej stronie"
-
 msgid "Reversed land: land not on left side"
 msgstr "Odwrócona linia lądu: ląd nie znajduje się po lewej stronie"
 
@@ -5420,9 +5432,6 @@ msgstr "Długość geograficzna punktu wskazywanego przez kursor."
 msgid "System of measurement changed to {0}"
 msgstr "Zmieniono system miar na {0}"
 
-msgid "Layer not in list."
-msgstr "warstwa nie jest na liście."
-
 msgid "Default (open, closed, new)"
 msgstr "Domyślnie (otwarte, zamknięte, nowe)"
 
@@ -6286,7 +6295,7 @@ msgid "Select all objects assigned to the currently selected changesets"
 msgstr "Zaznacza wszystkie obiekty będące częścią wybranych zestawów danych"
 
 msgid "Download"
-msgstr "Pobieranie"
+msgstr "Pobierz"
 
 msgid ""
 "Download information about the selected changesets from the OSM server"
@@ -6947,6 +6956,9 @@ msgstr "Sortuj uwagi"
 msgid "Sort"
 msgstr "Sortuj"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Typ obiektu:"
 
@@ -7193,6 +7205,14 @@ msgstr "Pobierz zawartość zestawu zmian"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Pobiera zawartość wybranych zestawów zmian z serwera"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Moje zestawy zmian"
 
@@ -7863,9 +7883,9 @@ msgstr[2] "Zmienianie wartości"
 
 msgid "This will change {0} object."
 msgid_plural "This will change up to {0} objects."
-msgstr[0] "Zmiana zostanie zastosowana do {0} obiektu."
-msgstr[1] "Zmiana zostanie zastosowana do {0} obiektów."
-msgstr[2] "Zmiana zostanie zastosowana do {0} obiektów."
+msgstr[0] "Zostanie zmieniony {0} obiekt."
+msgstr[1] "Zostaną zmienione {0} obiekty."
+msgstr[2] "Zostanie zmienionych {0} obiektów."
 
 msgid "An empty value deletes the tag."
 msgstr "Pusta wartość usunie znacznik."
@@ -8468,7 +8488,7 @@ msgid "Select to download OSM data in the selected download area."
 msgstr "Pobiera dane OSM ze wskazanego obszaru"
 
 msgid "Raw GPS data"
-msgstr "Surowe dane GPS"
+msgstr "Nieprzetworzone dane GPS"
 
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Pobiera ślady GPS ze wskazanego obszaru"
@@ -8571,9 +8591,6 @@ msgstr "Wprowadza nazwę miejsca do wyszukania"
 msgid "Areas around places"
 msgstr "Obszary i miejsca"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Wyjątek pustego wskaźnika. Możliwe brakujące znaczniki."
-
 msgid "Search ..."
 msgstr "Wyszukaj..."
 
@@ -8779,8 +8796,7 @@ msgstr ""
 
 msgid "This changeset has {0} comment"
 msgid_plural "This changeset has {0} comments"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ten zestaw zmian ma {0} komentarz"
 
 msgid "Changeset"
 msgstr "Zestaw zmian"
@@ -8922,7 +8938,7 @@ msgid "Enter an upload comment"
 msgstr "Wprowadza komentarz przesyłania"
 
 msgid "Specify the data source for the changes"
-msgstr "Zasoby danych dla zmian"
+msgstr "Podaj źródło danych"
 
 msgid "obtain from current layers"
 msgstr "pobierz z bieżących warstw"
@@ -9108,7 +9124,7 @@ msgstr "Brak tożsamości użytkownika"
 msgid ""
 "Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
 msgstr ""
-"Pobieranie informacji na temat bieżącego użytkownika JOSM nie powiodło się. "
+"Nie udało się pobrać informacji na temat aktualnego użytkownika JOSM. "
 "Wyjątek: {0}"
 
 msgid "Initializing nodes to download ..."
@@ -9191,6 +9207,9 @@ msgstr "Zapisywanie lub wysyłanie zmian przed zakończeniem programu"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Zapisywanie lub wysyłanie zmian przed usunięciem"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Wysyłanie i zapisywanie zmodyfikowanych warstw..."
 
@@ -9250,6 +9269,12 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "Kończy działanie programu bez zapisywania. Niezapisane dane zostaną utracone."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Usuń"
 
@@ -9264,6 +9289,12 @@ msgstr ""
 "Wykonuje wskazane czynności i kończy działanie programu. Niezapisane zmiany "
 "zostaną wysłane i/lub zapisane."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Wykonaj czynności i usuń"
 
@@ -10088,7 +10119,7 @@ msgid "Invalid date"
 msgstr "Nieprawidłowa data"
 
 msgid "<No GPX track loaded yet>"
-msgstr "<Nie wczytano jeszcze ścieżek GPX>"
+msgstr "<Nie wczytano jeszcze śladu GPX>"
 
 msgid "GPX track: "
 msgstr "Scieżka GPX: "
@@ -11533,6 +11564,9 @@ msgstr "Strzałki ulic jednokierunkowych"
 msgid "Draw segment order numbers"
 msgstr "Numery segmentów"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Granice obszaru pobranych danych"
 
@@ -11681,7 +11715,7 @@ msgid "Single Color (can be customized for named layers)"
 msgstr "Jeden kolor (moze być zmieniony dla nazwanej warstwy)"
 
 msgid "Car"
-msgstr "Samochód"
+msgstr "Samochody"
 
 msgid "Bicycle"
 msgstr "Rowery"
@@ -13246,7 +13280,7 @@ msgid "Show only applicable to selection"
 msgstr "Pokaż tylko odpowiednie do zaznaczenia"
 
 msgid "Search in tags"
-msgstr "Szukaj w tagach"
+msgstr "Wyszukanie w znacznikach"
 
 msgid "Add toolbar button"
 msgstr "Dodaj przycisk do paska narzędzi"
@@ -13752,6 +13786,9 @@ msgstr "Import NMEA zakończony powodzeniem:"
 msgid "NMEA import failure!"
 msgstr "Import NMEA zakończony niepowodzeniem!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Wyjątek pustego wskaźnika. Możliwe brakujące znaczniki."
+
 msgid "Note Files"
 msgstr "Pliki uwag"
 
@@ -14124,6 +14161,9 @@ msgstr "Przesyłanie danych..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Znaleziono nieoczekiwane ID 0 na elemencie"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "Pobieranie danych..."
 
@@ -15483,7 +15523,7 @@ msgstr "zarośla"
 
 msgctxt "natural"
 msgid "wood"
-msgstr ""
+msgstr "drzewa"
 
 msgctxt "Relation type"
 msgid "associatedStreet"
@@ -15876,6 +15916,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15987,7 +16030,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -16166,6 +16212,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16460,18 +16509,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -16481,6 +16518,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -16613,6 +16653,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -16982,6 +17025,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Pobiera dane z OSM znajdujące się wzdłuż linii."
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17099,6 +17145,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Pomaga w wektoryzacji obrazów WMS."
 
@@ -17312,6 +17361,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Dzieli pojedynczy obrys na wiele domów w zabudowie szeregowej."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17336,6 +17390,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17496,6 +17553,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17566,7 +17627,7 @@ msgid "Width (meters)"
 msgstr "Szerokość (w metrach)"
 
 msgid "Sidewalk"
-msgstr ""
+msgstr "Chodnik"
 
 msgctxt "sidewalk"
 msgid "both"
@@ -18357,19 +18418,19 @@ msgid "Water access rules:"
 msgstr "Dostęp dla żeglugi:"
 
 msgid "Ship"
-msgstr "Statek"
+msgstr "Statki"
 
 msgid "designated"
 msgstr "dla wyznaczonych pojazdów"
 
 msgid "Boat"
-msgstr "Łódź"
+msgstr "Łodzie"
 
 msgid "Motorboat"
-msgstr "Motorówka"
+msgstr "Motorówki"
 
 msgid "Canoe"
-msgstr "Kajak"
+msgstr "Kajaki"
 
 msgid "Substance"
 msgstr "Substancja"
@@ -18814,6 +18875,9 @@ msgstr "w budowie"
 msgid "Ford"
 msgstr "Bród"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Drogi"
 
@@ -19480,13 +19544,13 @@ msgid "Basin"
 msgstr "Zbiornik wód deszczowych"
 
 msgid "retention"
-msgstr ""
+msgstr "zbiornik retencyjny"
 
 msgid "infiltration"
-msgstr ""
+msgstr "obszar wodochłonny"
 
 msgid "detention"
-msgstr ""
+msgstr "polder przeciwpowodziowy"
 
 msgid "Reservoir"
 msgstr "Sztuczne jezioro"
@@ -19535,10 +19599,10 @@ msgid "river"
 msgstr "rzeka"
 
 msgid "lock"
-msgstr ""
+msgstr "śluza"
 
 msgid "wastewater"
-msgstr ""
+msgstr "ścieki"
 
 msgid "Salt Water"
 msgstr "Słona woda"
@@ -19584,13 +19648,13 @@ msgid "mangrove"
 msgstr "namorzyny"
 
 msgid "wet_meadow"
-msgstr ""
+msgstr "podmokłe łąki"
 
 msgid "string_bog"
-msgstr ""
+msgstr "torfowisko Aapa"
 
 msgid "saltern"
-msgstr ""
+msgstr "odsalniarnia"
 
 msgid "Mud"
 msgstr "Błota"
@@ -20033,7 +20097,7 @@ msgid "With shop"
 msgstr "Ze sklepem"
 
 msgid "convenience"
-msgstr "sklep osiedlowy"
+msgstr "sklep ogólnospożywczy"
 
 msgid "kiosk"
 msgstr "kiosk"
@@ -20072,16 +20136,16 @@ msgid "Amperage"
 msgstr "Natężenie"
 
 msgid "Types of vehicles which can be charged:"
-msgstr ""
+msgstr "Obsługiwane typy pojazdów:"
 
 msgid "Scooter"
-msgstr ""
+msgstr "Skutery"
 
 msgid "Truck"
-msgstr ""
+msgstr "Ciężarówki"
 
 msgid "Number of Sockets:"
-msgstr ""
+msgstr "Liczba wtyczek"
 
 msgid "Type 1 (Yazaki)"
 msgstr ""
@@ -20435,6 +20499,9 @@ msgstr "Pas startowy"
 msgid "Taxiway"
 msgstr "Droga kołowania"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Lądowisko dla helikopterów"
 
@@ -20746,7 +20813,7 @@ msgid "Water Park"
 msgstr "Park wodny"
 
 msgid "Beach Resort"
-msgstr ""
+msgstr "Ośrodek wypoczynkowy z plażą"
 
 msgid "Swimming Pool"
 msgstr "Basen"
@@ -20776,7 +20843,7 @@ msgid "Picnic Table"
 msgstr "Stół piknikowy"
 
 msgid "Public Grill"
-msgstr "Publiczny gril"
+msgstr "Publiczny grill"
 
 msgctxt "grill"
 msgid "Fuel"
@@ -21105,11 +21172,11 @@ msgstr "Numer punktu"
 msgid "Point Name"
 msgstr "Nazwa punktu"
 
-msgid "Phone Number"
-msgstr "Numer telefonu"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Weterynarz"
@@ -21123,6 +21190,12 @@ msgstr "Stacja pogotowia ratunkowego"
 msgid "Automated Defibrillator"
 msgstr "Automatyczny defibrylator (AED)"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Numer telefonu"
+
 msgid "Located inside a building?"
 msgstr "Wewnątrz budynku"
 
@@ -21992,6 +22065,10 @@ msgid "university"
 msgstr "uniwersytet"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "szpital"
 
@@ -22076,6 +22153,10 @@ msgid "public"
 msgstr "budynek użyteczności publicznej"
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Poziomy"
 
@@ -23384,7 +23465,7 @@ msgid "Supermarket"
 msgstr "Supermarket"
 
 msgid "Convenience Store"
-msgstr "Sklep osiedlowy"
+msgstr "Sklep ogólnospożywczy"
 
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -23402,10 +23483,10 @@ msgid "Deli (Fine Food)"
 msgstr "Delikatesy"
 
 msgid "Pastry"
-msgstr ""
+msgstr "Słodkie wypieki"
 
 msgid "Confectionery"
-msgstr ""
+msgstr "Cukierki"
 
 msgid "Tea"
 msgstr "Wyroby herbaciane"
@@ -23570,13 +23651,13 @@ msgid "Hairdresser/Barber"
 msgstr "Fryzjer"
 
 msgid "Female"
-msgstr ""
+msgstr "Damski"
 
 msgid "Male"
-msgstr ""
+msgstr "Męski"
 
 msgid "Unisex"
-msgstr ""
+msgstr "Wspólny"
 
 msgid "Tattoo"
 msgstr "Tatuaże"
@@ -24186,7 +24267,7 @@ msgid "Islet"
 msgstr "Wysepka"
 
 msgid "Reef"
-msgstr ""
+msgstr "rafa"
 
 msgid "coral"
 msgstr ""
@@ -24284,7 +24365,13 @@ msgstr "Rezerwat przyrody"
 msgid "Scree"
 msgstr "Rumowisko"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -24437,7 +24524,7 @@ msgid "Plant Nursery"
 msgstr "Szkółka roślin"
 
 msgid "Aquaculture"
-msgstr ""
+msgstr "Akwakultura"
 
 msgid "shrimp"
 msgstr ""
@@ -24536,7 +24623,7 @@ msgid "Official name"
 msgstr "Oficjalna nazwa"
 
 msgid "Common name abbreviation"
-msgstr "Najpopularniejsze odmiany nazwy"
+msgstr "Powszechny skrót nazwy"
 
 msgid "Address"
 msgstr "Adres"
@@ -24955,16 +25042,10 @@ msgstr "Szlaki"
 msgid "Bicycle Route"
 msgstr "Szlak rowerowy"
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -24973,18 +25054,6 @@ msgstr "Górski szlak rowerowy"
 msgid "Hiking Route"
 msgstr "Szlak pieszy"
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr "infrastruktura"
 
@@ -24997,18 +25066,6 @@ msgstr "Szlak spacerowy"
 msgid "Riding Route"
 msgstr "Szlak konny"
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr "Trasa narciarska"
 
@@ -25201,9 +25258,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr "{0} bez {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} bez {1} lub {2}"
 
@@ -25213,6 +25281,12 @@ msgstr "{0} bez {1}, {2} lub {3}"
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -25228,39 +25302,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr "restauracja bez wpisanej nazwy"
-
-msgid "{0} used with {1}"
-msgstr "{0} użyte z {1}"
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25279,9 +25338,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} jest przestarzały"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -25336,10 +25404,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -25355,7 +25429,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25400,7 +25474,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -25434,6 +25508,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -25452,6 +25529,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr "{0} użyte z {1}"
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -25542,10 +25622,13 @@ msgstr "nieznanie wyznanie żydowskie"
 msgid "{0} is unnecessary"
 msgstr "{0} jest zbyteczne"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} jest zbyteczne dla {1}"
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -25794,6 +25877,27 @@ msgstr "Wysyłanie śladu GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Wysyła ślady do openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importowanie..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Skala:"
+
+msgid "unit(s) = "
+msgstr "jednostka(i) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Pokazuje profil wysokości"
 
@@ -26140,6 +26244,403 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr "Błąd tworzenia warstwy obrazu: "
 
+msgid "Mapillary Images"
+msgstr ""
+
+msgid "Mapillary layer"
+msgstr ""
+
+msgid "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr "obrazy"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr "Powiększ do wybranego obrazu"
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Zaimportowane obrazy"
+
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr "Zaloguj"
+
+msgid "Logout"
+msgstr "Wyloguj"
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+
+msgid "Downloading"
+msgstr "Pobieranie"
+
+msgid "Select mode"
+msgstr "Wybierz tryb"
+
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr ""
 
@@ -26796,7 +27297,7 @@ msgid "Create building"
 msgstr "Utwórz budynek"
 
 msgid "Set buildings size"
-msgstr "Ustalanie wielkości budynków"
+msgstr "Ustal wielkości budynków"
 
 msgid "Use Address dialog"
 msgstr "Używanie okna wprowadzania adresu"
@@ -26817,7 +27318,7 @@ msgid "Advanced..."
 msgstr "Zaawansowane..."
 
 msgid "Draw buildings"
-msgstr "Rysuje budynki"
+msgstr "Rysowanie budynków"
 
 msgid "Point on the corner of the building to start drawing"
 msgstr "Proszę postawić punkt naroża budynku, aby rozpocząć rysowanie"
@@ -27796,9 +28297,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Login"
-msgstr "Zaloguj"
-
 msgid "Enable autologin"
 msgstr "Włącz automatyczne logowanie"
 
@@ -27809,7 +28307,7 @@ msgstr[1] "{0} użytkownicy"
 msgstr[2] "{0} użytkowników"
 
 msgid "not logged in"
-msgstr "nie zalogowany"
+msgstr "nie zalogowano"
 
 msgid "Failed to log in to GeoChat:"
 msgstr ""
@@ -27832,9 +28330,6 @@ msgstr "Prywatna rozmowa"
 msgid "Close tab"
 msgstr "Zamknij zakładkę"
 
-msgid "Logout"
-msgstr "Wyloguj"
-
 msgid "Clear log"
 msgstr "Wyczyść log"
 
@@ -28063,7 +28558,7 @@ msgid ""
 "File not found:\n"
 "{0}"
 msgstr ""
-"Plik nie znaleziony:\n"
+"Nie odnaleziono pliku:\n"
 "{0}"
 
 msgid ""
@@ -28072,7 +28567,7 @@ msgid ""
 msgstr ""
 
 msgid "File not found:\n"
-msgstr "Plik nie znaleziony:\n"
+msgstr "Nie odnaleziono pliku:\n"
 
 msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
@@ -28384,9 +28879,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -28556,21 +29048,9 @@ msgstr "Wczytane obrazy"
 msgid "Import vector graphics"
 msgstr "Importuje grafikę wektorową"
 
-msgid "Scale:"
-msgstr "Skala:"
-
-msgid "unit(s) = "
-msgstr "jednostka(i) = "
-
-msgid "Importing..."
-msgstr "Importowanie..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -28775,6 +29255,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Zastąp geometrię"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -29020,400 +29555,6 @@ msgstr ""
 msgid "Missing input data"
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr "obrazy"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr "Powiększ do wybranego obrazu"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Zaimportowane obrazy"
-
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-
-msgid "Downloading"
-msgstr "Pobieranie"
-
-msgid "Select mode"
-msgstr "Wybierz tryb"
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Zmierzone wartości"
 
@@ -30325,7 +30466,7 @@ msgid "Encrypted documents not supported."
 msgstr "Zakodowane dokumenty nie są wspierane."
 
 msgid "The PDF file must have exactly one page."
-msgstr "Plik PDF musi posiadać dokładnie jedną stronę."
+msgstr "Plik PDF musi mieć dokładnie jedną stronę."
 
 msgid "Read error: "
 msgstr "Błąd odczytu: "
@@ -30643,7 +30784,7 @@ msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
 msgid "A calibration file associated to the picture file was found: {0}\n"
-msgstr "Plik kalibracji przypisany do obrazu został znaleziony: {0}\n"
+msgstr "Odnaleziono plik kalibracji przypisany do obrazu: {0}\n"
 
 msgid ""
 "Set \"{0}\" to yes/no/ask in the preferences\n"
@@ -30889,6 +31030,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "przeniesiony"
+
 msgid "rail"
 msgstr "szyna"
 
@@ -30984,9 +31128,6 @@ msgstr ""
 msgid "Join"
 msgstr "Połącz"
 
-msgid "moved"
-msgstr "przeniesiony"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -31170,7 +31311,7 @@ msgid "Filters"
 msgstr "Filtry"
 
 msgid "Choose Filter"
-msgstr ""
+msgstr "Wybierz filtr"
 
 msgid "JSlider initialization error. Make sure your meta-inf is correct."
 msgstr ""
@@ -31696,10 +31837,10 @@ msgid "Align building "
 msgstr ""
 
 msgid "Select building"
-msgstr ""
+msgstr "Wybierz budynek"
 
 msgid "Select road"
-msgstr ""
+msgstr "Wybierz drogę"
 
 msgid "Select none"
 msgstr ""
@@ -31777,7 +31918,7 @@ msgid "Merge Nearby Nodes Threshold"
 msgstr ""
 
 msgid "SeaMap Editor"
-msgstr ""
+msgstr "SeaMap Edytor"
 
 msgid "Spline drawing"
 msgstr ""
@@ -32001,6 +32142,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -32026,13 +32227,13 @@ msgid "Skip Error"
 msgstr ""
 
 msgid "Fixed"
-msgstr ""
+msgstr "Poprawione"
 
 msgid "Fixed Error"
-msgstr ""
+msgstr "Poprawiono błąd"
 
 msgid "Not an error"
-msgstr ""
+msgstr "To nie jest błąd"
 
 msgid "<html><a href=\"\">List of tasks</a></html>"
 msgstr ""
@@ -32047,10 +32248,10 @@ msgid "~.02"
 msgstr ""
 
 msgid "Tasks"
-msgstr ""
+msgstr "Zadania"
 
 msgid "Config"
-msgstr ""
+msgstr "Ustawienia"
 
 msgid "Activation"
 msgstr ""
@@ -32079,7 +32280,7 @@ msgid "Something went wrong, try again"
 msgstr ""
 
 msgid "No change to upload!"
-msgstr ""
+msgstr "Brak zmian do wysłania"
 
 msgid "The bounding box is too big."
 msgstr ""
@@ -32167,7 +32368,7 @@ msgid "Tag:"
 msgstr "Tag:"
 
 msgid "Preferred values:"
-msgstr ""
+msgstr "Wartości preferowane"
 
 msgid "Delete parameter \"{0}\"?"
 msgstr ""
@@ -32443,7 +32644,7 @@ msgid "User-ID:"
 msgstr "User-ID:"
 
 msgid "Select algorithm:"
-msgstr ""
+msgstr "Wybierz algorytm:"
 
 msgid "Choose Bitlength (Strength):"
 msgstr ""
@@ -32457,6 +32658,84 @@ msgstr "Data zakończenia ważności klucza:"
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Do przodu"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Do tyłu"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Brak takiego pasa."
 
@@ -32477,7 +32756,7 @@ msgid "Validate turn- and lane-length-relations for consistency."
 msgstr ""
 
 msgid "Turn Lanes"
-msgstr ""
+msgstr "Pasy skrętu"
 
 msgid "Edit turn lanes"
 msgstr ""
@@ -32495,13 +32774,13 @@ msgid "Selects the offending relation."
 msgstr ""
 
 msgid "Add turn"
-msgstr ""
+msgstr "Dodaj skręt"
 
 msgid "Delete lane."
 msgstr "Usuń pas"
 
 msgid "Delete turn."
-msgstr ""
+msgstr "Usuń skręt"
 
 msgid "{0} lanes are not referenced in any turn-relation."
 msgstr ""
@@ -33358,9 +33637,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Zastąp geometrię"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Zastąp geometrię wybranego obiektu"
 
@@ -33563,15 +33839,9 @@ msgstr "otwiera/wstrzymuje odtwarzanie wideo"
 msgid "Video: {0}"
 msgstr "Film: {0}"
 
-msgid "Backward"
-msgstr "Do tyłu"
-
 msgid "jumps n sec back"
 msgstr "przeskakuje o n sekund do tyłu"
 
-msgid "Forward"
-msgstr "Do przodu"
-
 msgid "jumps n sec forward"
 msgstr "przeskakuje o n sekund do przodu"
 
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index b0b4bd7..be30051 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-13 14:55+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-09-10 17:36+0000\n"
 "Last-Translator: Rui <xande6ruz at yandex.com>\n"
 "Language-Team: Portuguese <pt at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:22+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:03+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: pt\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -215,18 +215,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Adicionar camada de imagem de fundo {0}"
 
-msgid "Error"
-msgstr "Erro"
-
-msgid "Select image format for WMS layer"
-msgstr "Selecione o formato de imagem para a camada WMS"
-
-msgid "Select WMS layers"
-msgstr "Selecione as camadas WMS"
-
-msgid "Add layers"
-msgstr "Adicionar camadas"
-
 msgid "Invalid service URL."
 msgstr "O endereço web de serviço é inválido."
 
@@ -239,6 +227,18 @@ msgstr "Não foi possível obter a lista de camadas WMS."
 msgid "Could not parse WMS layer list."
 msgstr "Não foi possível processar a lista de camadas WMS."
 
+msgid "Error"
+msgstr "Erro"
+
+msgid "Select image format for WMS layer"
+msgstr "Selecione o formato de imagem para a camada WMS"
+
+msgid "Select WMS layers"
+msgstr "Selecione as camadas WMS"
+
+msgid "Add layers"
+msgstr "Adicionar camadas"
+
 msgid "Add Node..."
 msgstr "Adicionar Nó Pelas Coordenadas..."
 
@@ -3626,9 +3626,6 @@ msgstr "Identificador de conjunto de matriz"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Sem camadas definidas pelo documento getCapabilities: {0}"
 
-msgid "No layer selected"
-msgstr "Nenhuma camada selecionada"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4073,12 +4070,12 @@ msgstr "Várias relações de estrada associada (associatedStreet)"
 msgid "House number without street"
 msgstr "Número de porta sem estrada"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Número de porta ''{0}'' duplicado"
-
 msgid "Duplicate house numbers"
 msgstr "Números de porta duplicados"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Número de porta ''{0}'' duplicado"
+
 msgid "Multiple street names in relation"
 msgstr "Vários nomes de estradas na relação"
 
@@ -4116,6 +4113,9 @@ msgstr "Linhas costeiras"
 msgid "This test checks that coastlines are correct."
 msgstr "Verifica se as linhas costeiras estão corretas."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Linha costeira no sentido inverso: a terra não está no lado esquerdo"
+
 msgid "Unconnected coastline"
 msgstr "Linha costeira não ligada"
 
@@ -4125,6 +4125,9 @@ msgstr "linha costeira não ordenada"
 msgid "Reversed coastline"
 msgstr "Linha de costa no sentido errado"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "Etiquetas Condicionais"
 
@@ -4163,6 +4166,12 @@ msgstr "Fronteiras que se cruzam"
 msgid "Crossing barriers"
 msgstr "Barreiras que se cruzam"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4399,6 +4408,12 @@ msgstr "Nenhuma função útil no membro do multi-polígono"
 msgid "Non-Way in multipolygon"
 msgstr "Não-linha dentro de um multi-polígono"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 "Tradução inexistente de ''name:'' no idioma nativo caso existam outras "
@@ -4627,32 +4642,32 @@ msgstr "Os valores de propriedades têm vários espaços em branco"
 msgid "Property values contain HTML entity"
 msgstr "Valores das etiquetas contêm entidades HTML"
 
+msgid "Misspelled property key"
+msgstr "Propriedade da chave com erro ortográfico"
+
 msgid "Key ''{0}'' looks like ''{1}''."
 msgstr "A chave ''{0}'' é parecida com ''{1}''."
 
-msgid "Misspelled property key"
-msgstr "Propriedade da chave com erro ortográfico"
+msgid "Presets do not contain property key"
+msgstr "A chave não existe nos modelos de etiquetas do JOSM"
 
 msgid "Key ''{0}'' not in presets."
 msgstr "Chave ''{0}'' não existente nos modelos de etiquetas"
 
-msgid "Presets do not contain property key"
-msgstr "A chave não existe nos modelos de etiquetas do JOSM"
+msgid "Misspelled property value"
+msgstr "Valor da propriedade mal escrito"
 
 msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr "O valor ''{0}'' para a chave ''{1}'' parece-se com ''{2}''."
 
-msgid "Misspelled property value"
-msgstr "Valor da propriedade mal escrito"
+msgid "Presets do not contain property value"
+msgstr "O valor não existe nos modelos de etiquetas do JOSM"
 
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 "O valor ''{0}'' para a chave ''{1}'' não existe nos modelos de etiquetas do "
 "JOSM."
 
-msgid "Presets do not contain property value"
-msgstr "O valor não existe nos modelos de etiquetas do JOSM"
-
 msgid "FIXMES"
 msgstr "FIXMES (indicações a outros editores para corrigir)"
 
@@ -4922,9 +4937,6 @@ msgstr ""
 "Verifica se existem erros na direção de linhas costeiras, linhas terrestres "
 "e cursos de água."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Linha costeira no sentido inverso: a terra não está no lado esquerdo"
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 "Linha terrestre no sentido inverso: a terra não está no lado esquerdo"
@@ -5483,9 +5495,6 @@ msgstr "A longitude geográfico no cursor do rato."
 msgid "System of measurement changed to {0}"
 msgstr "Sistema de medidas alterado para {0}"
 
-msgid "Layer not in list."
-msgstr "A camada não existe na lista."
-
 msgid "Default (open, closed, new)"
 msgstr "Padrão (aberto, fechado, novo)"
 
@@ -7032,6 +7041,9 @@ msgstr "Ordenar erros"
 msgid "Sort"
 msgstr "Ordenar"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tipo de objeto:"
 
@@ -7291,6 +7303,14 @@ msgid "Download the content of the selected changesets from the server"
 msgstr ""
 "Descarregar o conteúdo do conjunto de alterações do servidor do OpenStreetMap"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Obter os meus conjuntos de alterações"
 
@@ -8720,9 +8740,6 @@ msgstr "Introduza o nome do local que pretende pesquisar"
 msgid "Areas around places"
 msgstr "Locais"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Erro Null pointer exception provavelmente por faltarem tags."
-
 msgid "Search ..."
 msgstr "Pesquisar"
 
@@ -9372,6 +9389,9 @@ msgstr "Alterações por gravar - Gravar e/ou enviar antes de sair?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Alterações por gravar - Gravar e/ou enviar antes de eliminar?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "A enviar e gravar camadas alteradas ..."
 
@@ -9441,6 +9461,12 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "Sair do JOSM sem gravar. As alterações por gravar serão deitadas fora."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Eliminar agora!"
 
@@ -9456,6 +9482,12 @@ msgstr ""
 "Sair do JOSM após gravar. As alterações por gravar são enviadas e/ou "
 "gravadas."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Fazer ações antes de eliminar"
 
@@ -11783,6 +11815,9 @@ msgstr "Mostrar setas de direção em vias de sentido único."
 msgid "Draw segment order numbers"
 msgstr "Mostrar números de ordem dos segmentos"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Mostrar limites dos dados descarregados"
 
@@ -14133,6 +14168,9 @@ msgstr "Sucesso na importação de NMEA:"
 msgid "NMEA import failure!"
 msgstr "Falhou a importação de ficheiro NMEA-0183!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Erro Null pointer exception provavelmente por faltarem tags."
+
 msgid "Note Files"
 msgstr "Ficheiros de Erros nos Mapas Reportados"
 
@@ -14538,6 +14576,9 @@ msgstr "A enviar dados ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Foi encontrado um identificador 0 inesperado para o objeto OSM"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "A descarregar os dados"
 
@@ -15890,16 +15931,16 @@ msgid ""
 msgstr ""
 
 msgid "Debug information"
-msgstr ""
+msgstr "Informações de depuração"
 
 msgid "Manually report at:"
-msgstr ""
+msgstr "Reportar manualmente em:"
 
 msgid "Is JOSM up to date?"
-msgstr ""
+msgstr "O JOSM está atualizado?"
 
 msgid "Send bug report"
-msgstr ""
+msgstr "Enviar relatório de erro"
 
 msgid ""
 "If you are running the latest version of JOSM and the plugins, please file a "
@@ -15913,13 +15954,13 @@ msgid "Report Bug"
 msgstr "Comunicar um Erro"
 
 msgid "Suppress this error for this session."
-msgstr ""
+msgstr "Suprimir este erro para esta sessão"
 
 msgid "Suppress further error dialogs for this session."
 msgstr "Não mostrar mais avisos de erros nesta sessão."
 
 msgid "Ignore this error."
-msgstr ""
+msgstr "Ignorar este erro."
 
 msgid ""
 "Opening the bug report failed. Please report manually using this website:"
@@ -15928,28 +15969,32 @@ msgstr ""
 "erro acedendo ao site:"
 
 msgid "Include the system status report."
-msgstr ""
+msgstr "Incluir o relatório do estado do sistema operativo."
 
 msgid "Include information about the data you were working on."
-msgstr ""
+msgstr "Incluir informações sobre os dados em que estava a trabalhar."
 
 msgid "Include all stack traces."
 msgstr ""
 
 msgid "Your current version of JOSM is {0}"
-msgstr ""
+msgstr "A versão atual do JOSM que está a usar é {0}"
 
 msgid "JOSM is searching for updates..."
-msgstr ""
+msgstr "O JOSM está à procura de atualizações..."
 
 msgid "An error occured while checking if your JOSM instance is up to date."
 msgstr ""
+"Ocorreu um erro ao tentar verificar se o JOSM que está a usar está "
+"atualizado."
 
 msgid "JOSM is up to date."
 msgstr "O JOSM está atualizado."
 
 msgid "JOSM is out of date. The current version is {0}. Try updating JOSM."
 msgstr ""
+"O JOSM que está a usar está desatualizado, A versão atual é {0}. Tente "
+"atualizar o JOSM."
 
 msgid ""
 "Before you file a bug report make sure you have updated to the latest "
@@ -16455,6 +16500,9 @@ msgstr "Tiris: DGM (Terrain model)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Modelo de superfície)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viena: Mehrzweckkarte (usos gerais)"
 
@@ -16566,8 +16614,11 @@ msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16712,7 +16763,7 @@ msgid "Erlangen aerial imagery (2013 6.25 cm)"
 msgstr "Erlangen imagens aéreas (2013 6.25 cm)"
 
 msgid "Erlangen aerial imagery (2011 5.0 cm)"
-msgstr ""
+msgstr "Alemanha - Erlangen - imagens aéreas (2011 5.0 cm)"
 
 msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
 msgstr ""
@@ -16748,6 +16799,9 @@ msgstr "Imagens de Drone 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drone Imagery Canaan(Haiti) Novembro 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortofoto 2000"
 
@@ -17044,18 +17098,6 @@ msgstr "Freemap.sk - Bicicleta"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk - Esqui"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Eslováquia EEA GMES Atlas Urbano"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Eslováquia - EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Eslováquia - Mapas Históricos"
 
@@ -17065,6 +17107,9 @@ msgstr "RABA-KGZ: Eslovénia - uso do solo agrícola"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Eslovénia - áreas com contruções"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "África do Sul CD:NGI Aérea"
 
@@ -17112,9 +17157,12 @@ msgstr "Zurique - Stadt Luftbild 2011"
 
 msgid "Aerial imagery canton Solothurn RGB (SOGIS 2013/2014/2015)"
 msgstr ""
+"Suíça - cantão de Solothurn - imagens aéreas RGB (SOGIS 2013/2014/2015)"
 
 msgid "Aerial imagery canton Solothurn Infrared (SOGIS 2013/2014/2015)"
 msgstr ""
+"Suíça - cantão de Solothurn - imagens aéreas infravermelhos (SOGIS "
+"2013/2014/2015)"
 
 msgid "Canton de Génève 5cm (SITG 2011)"
 msgstr "Cantão de Genebra 5cm (SITG 2011)"
@@ -17197,6 +17245,9 @@ msgstr "Estradas Florestais dos E.U.A."
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ucrânia - Ortofotomapas 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Ucrânia - Kyev 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -17560,7 +17611,7 @@ msgid "Create a grid of ways."
 msgstr "Criar uma grelha de linhas."
 
 msgid "Customization of public transport stops."
-msgstr ""
+msgstr "Personalização de paragens de trensporte público"
 
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -17588,6 +17639,9 @@ msgstr ""
 "Descarrega dados do OSM ao longo de uma linha. Após instalação a ferramenta "
 "fica disponível no menu ''Ferramentas''."
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17734,6 +17788,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 "[módulo descontinuado] Módulo de vetorização que permite criar áreas de "
@@ -17766,6 +17823,15 @@ msgstr ""
 
 msgid "Allows the user to work with pictures hosted at mapillary.com"
 msgstr ""
+"Permite usar fotografias geo-referenciadas ao nível da rua do site "
+"mapillary.com; Depois de instalado este módulo, está disponível o menu "
+"Imagens de Fundo>Mapillary, que adiciona uma camada \"Mapillary\" e abre um "
+"painel lateral direito mostrando fotografias tiradas por utilizadores do "
+"mapillary.com das ruas e locais em geral para ajudar a mapear. Notar que as "
+"fotografias e os ícones e linhas do percurso na área de desenho podem "
+"demorar alguns segundos a aparecer (são carregadas automaticamente tal como "
+"as imagens de satélite do Bing). Caso não apareça nada na camada Mapillary é "
+"porque ainda ninguém tirou fotografias nesse local."
 
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -18013,6 +18079,11 @@ msgstr ""
 "os vários parâmetros."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -18037,6 +18108,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Módulo para assinar digitalmente dados do OpenStreetMap"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18228,6 +18302,10 @@ msgid "No wheeled vehicle"
 msgstr "Impossível passar com veículo de rodas."
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "campo"
 
@@ -18346,11 +18424,11 @@ msgstr ""
 
 msgctxt "electrified"
 msgid "no"
-msgstr ""
+msgstr "não"
 
 msgctxt "electrified"
 msgid "yes"
-msgstr ""
+msgstr "sim"
 
 msgctxt "electrified"
 msgid "rail"
@@ -19556,6 +19634,9 @@ msgstr "em_contrução"
 msgid "Ford"
 msgstr "Vau (ponto de passagem num curso de água baixo)"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Caminhos"
 
@@ -20104,7 +20185,7 @@ msgid "Kerb"
 msgstr "Lancil (passeio desnivelado sem rampa)"
 
 msgid "Tactile paving"
-msgstr ""
+msgstr "Pavimento tátil"
 
 msgid "Entrance (Barrier Opening)"
 msgstr "Entrada (ponto de passagem aberta sem barreiras)"
@@ -20243,13 +20324,13 @@ msgid "Reservoir"
 msgstr "Reservatório artificial (tanque, albufeira de barragem...)"
 
 msgid "evaporator"
-msgstr ""
+msgstr "evaporador"
 
 msgid "tailings"
 msgstr ""
 
 msgid "water_storage"
-msgstr ""
+msgstr "armazenamento de água"
 
 msgid "Covered Reservoir"
 msgstr "Reservatório Coberto"
@@ -20827,16 +20908,16 @@ msgid "Amperage"
 msgstr "Amperagem"
 
 msgid "Types of vehicles which can be charged:"
-msgstr ""
+msgstr "Tipos de veículos que podem ser recarregados:"
 
 msgid "Scooter"
-msgstr ""
+msgstr "Lambreta/Scoter"
 
 msgid "Truck"
-msgstr ""
+msgstr "Camião"
 
 msgid "Number of Sockets:"
-msgstr ""
+msgstr "Número de Tomadas:"
 
 msgid "Type 1 (Yazaki)"
 msgstr ""
@@ -20878,19 +20959,19 @@ msgid "NEMA 5-20"
 msgstr ""
 
 msgid "Authentication:"
-msgstr ""
+msgstr "Autenticação:"
 
 msgid "Phone call"
-msgstr ""
+msgstr "Chamada telefónica"
 
 msgid "Short message"
-msgstr ""
+msgstr "Mensagem SMS"
 
 msgid "NFC"
-msgstr ""
+msgstr "Comunicação por proximidade NFC"
 
 msgid "Membership card"
-msgstr ""
+msgstr "Cartão de membro"
 
 msgid "Wash"
 msgstr "Lavagem"
@@ -21190,6 +21271,9 @@ msgstr "Pista de Aterragem e Descolagem"
 msgid "Taxiway"
 msgstr "Via de Circulação (Taxiway)"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Heliponto (ponto de aterrarem/descolagem)"
 
@@ -21512,7 +21596,7 @@ msgid "Used for the water area only."
 msgstr "Usado apenas na área de água"
 
 msgid "Fitness Station"
-msgstr ""
+msgstr "Ginário, Academia Desportiva (empresa privada)"
 
 msgid "Sauna"
 msgstr "Sauna"
@@ -21863,11 +21947,11 @@ msgstr "Número do Acesso"
 msgid "Point Name"
 msgstr "Nome do Acesso"
 
-msgid "Phone Number"
-msgstr "Número de Telefone"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Usar código internacional, p.ex. +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinário"
@@ -21881,6 +21965,12 @@ msgstr "Central de ambulância"
 msgid "Automated Defibrillator"
 msgstr "Desfibrilador Automático Portátil"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Número de Telefone"
+
 msgid "Located inside a building?"
 msgstr "Localizado dentro de um edifício"
 
@@ -22315,7 +22405,7 @@ msgid "Sports Centre"
 msgstr "Centro Desportivo"
 
 msgid "Fitness Centre"
-msgstr ""
+msgstr "Ginásio privado, Academia Desportiva"
 
 msgid "Pitch"
 msgstr "Campo"
@@ -22466,7 +22556,7 @@ msgid "Gymnastics"
 msgstr "Ginástica"
 
 msgid "fitness_centre"
-msgstr ""
+msgstr "ginásio privado"
 
 msgid "Ice Skating"
 msgstr ""
@@ -22752,6 +22842,10 @@ msgid "university"
 msgstr "universidade"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "hospital"
 
@@ -22836,6 +22930,10 @@ msgid "public"
 msgstr "público"
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Andares"
 
@@ -24329,13 +24427,13 @@ msgid "Hairdresser/Barber"
 msgstr "Cabeleireiro/Barbeiro"
 
 msgid "Female"
-msgstr ""
+msgstr "Feminino"
 
 msgid "Male"
-msgstr ""
+msgstr "Masculino"
 
 msgid "Unisex"
-msgstr ""
+msgstr "Unisexo"
 
 msgid "Tattoo"
 msgstr "Tatuagens"
@@ -24443,7 +24541,7 @@ msgid "food"
 msgstr "alimentos"
 
 msgid "milk"
-msgstr ""
+msgstr "leite"
 
 msgid "newspapers"
 msgstr "Jornais"
@@ -24628,13 +24726,13 @@ msgid "Government"
 msgstr "Escritório da administração nacional (genérico)"
 
 msgid "ministry"
-msgstr ""
+msgstr "ministério"
 
 msgid "prosecutor"
-msgstr ""
+msgstr "procurador"
 
 msgid "tax"
-msgstr ""
+msgstr "impostos"
 
 msgid "register_office"
 msgstr ""
@@ -24947,16 +25045,16 @@ msgid "Islet"
 msgstr "Ilhéu"
 
 msgid "Reef"
-msgstr ""
+msgstr "Recife"
 
 msgid "coral"
-msgstr ""
+msgstr "coral"
 
 msgid "oyster"
-msgstr ""
+msgstr "ostras"
 
 msgid "rock"
-msgstr ""
+msgstr "rochedo"
 
 msgid "Nature"
 msgstr "Natureza"
@@ -25049,8 +25147,14 @@ msgstr "Reserva Natural"
 msgid "Scree"
 msgstr "Escarpa de Rochas Soltas"
 
-msgid "An accumulation of loose rocks."
-msgstr "Um acumulação de pedras soltas."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr ""
@@ -25729,17 +25833,11 @@ msgstr "Rotas"
 msgid "Bicycle Route"
 msgstr "Rota de Ciclismo"
 
-msgid "icn"
-msgstr "icn (rota inernacional)"
-
-msgid "ncn"
-msgstr "ncn (rota nacional)"
-
-msgid "rcn"
-msgstr "rcn (rota regional)"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "lcn (rota local)"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Rota de Ciclismo de Montanha"
@@ -25747,18 +25845,6 @@ msgstr "Rota de Ciclismo de Montanha"
 msgid "Hiking Route"
 msgstr "Rota de Caminhadas"
 
-msgid "iwn"
-msgstr "iwn (rota internacional)"
-
-msgid "nwn"
-msgstr "nwn (rota nacional)"
-
-msgid "rwn"
-msgstr "rwn (rota regional)"
-
-msgid "lwn"
-msgstr "lwn (rota local)"
-
 msgid "infrastructure"
 msgstr "infraestrutura"
 
@@ -25771,18 +25857,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr "Rota de pista na neve (esqui, downhill, trenó, snowboard...)"
 
@@ -25969,18 +26043,29 @@ msgid "Test"
 msgstr "Teste"
 
 msgid "Even housenumber in odd address interpolation."
-msgstr ""
+msgstr "Número de porta PAR na interpolação de endereços"
 
 msgid "Odd housenumber in even address interpolation."
-msgstr ""
+msgstr "Número de porta ÍMPAR na interpolação de endereços"
 
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 "Via com {0}. Etiquetar cada número de porta separadamente se possível."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr "O mesmo valor de {0} e {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} sem {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} sem {1} ou {2}"
 
@@ -25990,6 +26075,12 @@ msgstr "{0} sem {1}, {2} ou {3}"
 msgid "{0} together with {1}"
 msgstr "{0} junto com {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "objeto incompleto: apenas {0}"
 
@@ -26005,41 +26096,26 @@ msgstr "{0} junto com {1} e valores em conflito"
 msgid "{0} on suspicious object"
 msgstr "{0} sem etiquetas adicionais"
 
-msgid "restaurant without name"
-msgstr "restaurante sem nome"
-
-msgid "{0} used with {1}"
-msgstr "{0} usada em simultâneo com {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "etiqueta de água utilizada em piscina"
 
 msgid "sport without physical feature"
 msgstr "etiqueta desporto sem nenhuma outra etiqueta física, por ex. campo"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} deve estar no nó onde{1} e {2} se cruzam"
-
 msgid "alternative name without {0}"
 msgstr "c/nome alternativo mas sem etiqueta {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "uso incompleto de {0} numa via sem {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "O mesmo valor de {0} e {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "O mesmo valor de {0}, {1} e {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} e {1} junto com {2} e valores em conflito"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Combinação de etiquetas suspeita: {0} e {1}"
-
 msgid "{0} on a relation without {1}"
-msgstr ""
+msgstr "{0} numa relação sem {1}"
 
 msgid ""
 "Long waterway with {0} but without a tag which defines it as tunnel or "
@@ -26054,11 +26130,20 @@ msgid ""
 msgstr ""
 
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
+msgstr "{0} junto com {1} e {2}. Remover {1} e {2}"
+
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
 msgstr ""
 
 msgid "{0} is deprecated"
 msgstr "''{0}'' está em desuso"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr "''{0}'' é genérico, use etiquetas +específicas como ''{1}''"
 
@@ -26121,11 +26206,17 @@ msgstr "Etiqueta genérica {0}"
 msgid "Definition of {0} is unclear"
 msgstr "A definição de {0} é incerta"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} não é recomendado. Utilize Inverter Sentido da Linha no menu Ferramentas"
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "chave com um caractere incomum"
 
@@ -26141,8 +26232,8 @@ msgstr "{0} está em desuso a favor de {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} está em desuso. Usar a chave de prefixo {1}:"
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "chave questionável (termina com um número): {0}"
+msgid "questionable key (ending with a number)"
+msgstr ""
 
 msgid "The key {0} has an uncommon value."
 msgstr "A chave {0} tem um valor incomum."
@@ -26186,8 +26277,8 @@ msgstr "Áreas Naturais idênticas sobrepostas"
 msgid "Overlapping Identical Landuses"
 msgstr "Usos do Solo sobrepostos"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} tem de estar numa linha"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "nó liga curso de água e ponte"
@@ -26220,6 +26311,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} deve estar no nó onde{1} e {2} se cruzam"
+
 msgid "abbreviated street name"
 msgstr "nome abreviado da rua"
 
@@ -26238,6 +26332,9 @@ msgstr "estrada sem etiqueta de referência (ref)"
 msgid "temporary highway type"
 msgstr "tipo de estrada temporária (etiqueta road)"
 
+msgid "{0} used with {1}"
+msgstr "{0} usada em simultâneo com {1}"
+
 msgid "street name contains ss"
 msgstr "nome da rua contém ss"
 
@@ -26269,7 +26366,7 @@ msgid "layer should be between -5 and 5"
 msgstr "O valor da etiqueta layer (nível) deve estar entre -5 e 5"
 
 msgid "{0} should have numbers only with optional .5 increments"
-msgstr ""
+msgstr "{0} deve ter apenas números com incrementos de .5 opcionalmente"
 
 msgid ""
 "{0}: meters is default; period is separator; if units, put space then unit"
@@ -26335,11 +26432,14 @@ msgstr "denominação religiosa judaica desconhecida"
 msgid "{0} is unnecessary"
 msgstr "{0} não é necessária"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} não é necessária em {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} não faz sentido"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Nós com etiquetas iguais às da da própria linha"
@@ -26603,6 +26703,27 @@ msgstr "A enviar Trilho GPS (GPX)"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Envia trilhos GPS para o openstreetmap.org"
 
+msgid "Importing..."
+msgstr "A importar..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "Por favor abra ou crie uma camada antes de importar"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Escala:"
+
+msgid "unit(s) = "
+msgstr "unidade(s) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Mostra os contornos de elevação"
 
@@ -26960,6 +27081,404 @@ 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 "Total images:"
+msgstr "Total de imagens:"
+
+msgid "images"
+msgstr "imagens"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "Fonte do sinal de tráfego ''{0}'' estava no formato errado"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Não foi possível ler o ficheiro da fonte de ''{0}''"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Criar camada Mapillary"
+
+msgid "Start Mapillary layer"
+msgstr "Começar camada 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 "Select pictures"
+msgstr "Selecionar imagens"
+
+msgid "Import pictures into sequence"
+msgstr "Importar as imagens em sequência"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importar imagens para a camada Mapillary  em sequência"
+
+msgid "Join mode"
+msgstr "Modo de unir"
+
+msgid "Join/unjoin pictures"
+msgstr "Unir/Separar imagens"
+
+msgid "Join Mapillary pictures"
+msgstr "Unir imagens Mapillary"
+
+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 "Upload pictures"
+msgstr "Enviar imagens"
+
+msgid "Upload Mapillary pictures"
+msgstr "Enviar imagens Mapillary"
+
+msgid "Upload pictures."
+msgstr "Enviar imagens."
+
+msgid "Walk mode"
+msgstr "Modo a pé"
+
+msgid "Start walk mode"
+msgstr "COmeçar 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 "View in website"
+msgstr "Ver no site"
+
+msgid "Copy key"
+msgstr "Copiar chave"
+
+msgid "Copy key tag"
+msgstr "Copiar etiqueta da chave"
+
+msgid "Edit on website"
+msgstr "Editar no site"
+
+msgid "Current Mapillary changeset"
+msgstr "Conjunto de alterações Mapillary atual"
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+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 folder"
+msgstr "Selecionar pasta"
+
+msgid "Explore"
+msgstr "Explorar"
+
+msgid "Select a directory"
+msgstr "Selecionar diretório"
+
+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 "Mapillary picture"
+msgstr "Imagem Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Abrir janela Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Janela Mapillary"
+
+msgid "Open Mapillary main dialog"
+msgstr "Abrir janela principal do 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 ""
+
+msgid "Login"
+msgstr "Iniciar sessão"
+
+msgid "Logout"
+msgstr "Terminar sessão"
+
+msgid "Download mode"
+msgstr "Modo de descarregamento"
+
+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 "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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 ""
+
+msgid "No images found"
+msgstr "Nenhuma imagem encontrada"
+
+msgid "You have successfully uploaded {0} images to mapillary.com"
+msgstr ""
+
+msgid "Finished upload"
+msgstr "Envio 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 "A enviar: {0}"
+
+msgid "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28817,9 +29336,6 @@ 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"
 
@@ -28852,9 +29368,6 @@ msgstr "Conversação privada"
 msgid "Close tab"
 msgstr "Fechar aba"
 
-msgid "Logout"
-msgstr "Terminar sessão"
-
 msgid "Clear log"
 msgstr "Limpar registo"
 
@@ -28862,16 +29375,16 @@ msgid "Show users on map"
 msgstr "Mostrar utilizadores no mapa"
 
 msgid "GeoJSON file"
-msgstr ""
+msgstr "Ficheiro GeoJSON"
 
 msgid "Loading json file..."
-msgstr ""
+msgstr "A carregar ficheiro JSON..."
 
 msgid "Data Layer from GeoJSON: "
-msgstr ""
+msgstr "Camada de dados do GeoJSON: "
 
 msgid "Error loading geojson file {0}"
-msgstr ""
+msgstr "Ocorreu um erro ao carregar o ficheiro GeoJSON {0}"
 
 msgid "Position only"
 msgstr "Apenas posição"
@@ -29443,9 +29956,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29639,21 +30149,9 @@ msgstr "Imagens Importadas"
 msgid "Import vector graphics"
 msgstr "Importar gráficos vetoriais"
 
-msgid "Scale:"
-msgstr "Escala:"
-
-msgid "unit(s) = "
-msgstr "unidade(s) = "
-
-msgid "Importing..."
-msgstr "A importar..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "Ficheiros SVG [módulo ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Por favor abra ou crie uma camada antes de importar"
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29661,10 +30159,10 @@ msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
 msgid "Vertical layer:"
-msgstr ""
+msgstr "Camada vertical:"
 
 msgid "Structure type:"
-msgstr ""
+msgstr "Tipo de estrutura:"
 
 msgid "Offset into background:"
 msgstr ""
@@ -29700,7 +30198,7 @@ msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
 msgid "Apply Tags"
-msgstr ""
+msgstr "Aplicar Etiquetas"
 
 msgid "Fitting"
 msgstr ""
@@ -29864,6 +30362,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Substituir Geometria (mantém histórico de autores)"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Não foi encontrado o índice de direções ''{0}''"
 
@@ -30124,403 +30677,6 @@ msgstr "Ativa o módulo de Listagem de erros do MapDust"
 msgid "Missing input data"
 msgstr "Faltam dados de entrada"
 
-msgid "Mapillary Images"
-msgstr "Imagens Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Camada Mapillary"
-
-msgid "Total images:"
-msgstr "Total de imagens:"
-
-msgid "images"
-msgstr "imagens"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Criar camada Mapillary"
-
-msgid "Start Mapillary layer"
-msgstr "Começar camada 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 "Select pictures"
-msgstr "Selecionar imagens"
-
-msgid "Import pictures into sequence"
-msgstr "Importar as imagens em sequência"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importar imagens para a camada Mapillary  em sequência"
-
-msgid "Join mode"
-msgstr "Modo de unir"
-
-msgid "Join/unjoin pictures"
-msgstr "Unir/Separar imagens"
-
-msgid "Join Mapillary pictures"
-msgstr "Unir imagens Mapillary"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr "Enviar imagens"
-
-msgid "Upload Mapillary pictures"
-msgstr "Enviar imagens Mapillary"
-
-msgid "Upload pictures."
-msgstr "Enviar imagens."
-
-msgid "Walk mode"
-msgstr "Modo a pé"
-
-msgid "Start walk mode"
-msgstr "COmeçar 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 "Uploaded {0} images"
-msgstr "Enviadas {0} imagens"
-
-msgid "Approve upload on the website"
-msgstr "Aprovar o envio no site."
-
-msgid "View in website"
-msgstr "Ver no site"
-
-msgid "Copy key"
-msgstr "Copiar chave"
-
-msgid "Copy key tag"
-msgstr "Copiar etiqueta da chave"
-
-msgid "Edit on website"
-msgstr "Editar no site"
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-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 folder"
-msgstr "Selecionar pasta"
-
-msgid "Explore"
-msgstr "Explorar"
-
-msgid "Select a directory"
-msgstr "Selecionar diretório"
-
-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 "Mapillary picture"
-msgstr "Imagem Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Abrir janela Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Janela Mapillary"
-
-msgid "Open Mapillary main dialog"
-msgstr "Abrir janela principal do 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 ""
-
-msgid "Download mode"
-msgstr "Modo de descarregamento"
-
-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 "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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"A área descarregada é demasiado grande. O modo de descarregamento foi "
-"alterado para semi-automático até que a camada seja reiniciada."
-
-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 ""
-
-msgid "No images found"
-msgstr "Nenhuma imagem encontrada"
-
-msgid "Finished upload"
-msgstr "Envio 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 "A enviar: {0}"
-
-msgid "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Valores medidos"
 
@@ -32080,6 +32236,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "movido"
+
 msgid "rail"
 msgstr "carril"
 
@@ -32178,9 +32337,6 @@ msgstr "Capturar"
 msgid "Join"
 msgstr "Unir"
 
-msgid "moved"
-msgstr "movido"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Transporte Público: unir paragens GTFS"
 
@@ -33260,6 +33416,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Dividir"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -33733,6 +33949,84 @@ msgstr "Escolha uma data de término da validade para a chave:"
 msgid "Create a new signing key"
 msgstr "Criar uma nova chave de assinatura"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Avançar"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Recuar"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "A faixa não existe."
 
@@ -34717,9 +35011,6 @@ msgstr "Encontrar objetos com estas etiquetas"
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Substituir Geometria (mantém histórico de autores)"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 "Substitui um objeto existente no OSM por um novo mantendo o histórico do "
@@ -34946,15 +35237,9 @@ msgstr "Inicia/pausa a reprodução do vídeo"
 msgid "Video: {0}"
 msgstr "Vídeo: {0}"
 
-msgid "Backward"
-msgstr "Recuar"
-
 msgid "jumps n sec back"
 msgstr "ir n segundos atrás"
 
-msgid "Forward"
-msgstr "Avançar"
-
 msgid "jumps n sec forward"
 msgstr "salta n segundos para a frente"
 
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index 985b83e..6a3a56d 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-09-03 00:39+0000\n"
-"Last-Translator: Don-vip <Unknown>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-06 07:02+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: 2016-09-06 05:44+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:14+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: pt_BR\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -216,18 +216,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Adicionar camada de imagem {0}"
 
-msgid "Error"
-msgstr "Erro"
-
-msgid "Select image format for WMS layer"
-msgstr "Selecione o formato da imagem para a camada WMS"
-
-msgid "Select WMS layers"
-msgstr "Selecionar camadas WMS"
-
-msgid "Add layers"
-msgstr "Adicionar camadas"
-
 msgid "Invalid service URL."
 msgstr "URL de serviço inválida."
 
@@ -240,6 +228,18 @@ msgstr "Não é possível recuperar lista de camada WMS."
 msgid "Could not parse WMS layer list."
 msgstr "Não é possível analisar lista de camada WMS."
 
+msgid "Error"
+msgstr "Erro"
+
+msgid "Select image format for WMS layer"
+msgstr "Selecione o formato da imagem para a camada WMS"
+
+msgid "Select WMS layers"
+msgstr "Selecionar camadas WMS"
+
+msgid "Add layers"
+msgstr "Adicionar camadas"
+
 msgid "Add Node..."
 msgstr "Adicionar Nó..."
 
@@ -1297,7 +1297,7 @@ msgid "You must enter a search term"
 msgstr "Você deve digitar um termo de busca"
 
 msgid "Select All"
-msgstr "Selecionar Tudo"
+msgstr "Selecionar tudo"
 
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1927,7 +1927,7 @@ msgid "Download GPS"
 msgstr "Baixar GPS"
 
 msgid "Downloading GPS data"
-msgstr "Baixando dados do GPS"
+msgstr "Baixando dados de GPS"
 
 msgid "Downloaded GPX Data"
 msgstr "Dados GPX baixados"
@@ -3582,9 +3582,6 @@ msgstr "Matrix set identifier"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Nenhuma camada definida pelo documento getCapabilities: {0}"
 
-msgid "No layer selected"
-msgstr "Nenhuma camada selecionada"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4028,12 +4025,12 @@ msgstr "Múltiplas relações de ruas associadas"
 msgid "House number without street"
 msgstr "Número de casa sem rua"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Número de casa ''{0}'' está duplicado"
-
 msgid "Duplicate house numbers"
 msgstr "Números de casas duplicados"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Número de casa ''{0}'' está duplicado"
+
 msgid "Multiple street names in relation"
 msgstr "Múltiplos nomes de ruas na relação"
 
@@ -4069,6 +4066,9 @@ msgstr "Linha costeira"
 msgid "This test checks that coastlines are correct."
 msgstr "Este teste verifica se linhas costeiras estão corretas."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Linha costeira invertida: sem terra do lado esquerdo"
+
 msgid "Unconnected coastline"
 msgstr "Linha costeira não conectada"
 
@@ -4078,6 +4078,9 @@ msgstr "Linha costeira não ordenada"
 msgid "Reversed coastline"
 msgstr "Linha costeira invertida"
 
+msgid "invalid coastline"
+msgstr "linha costeira inválida"
+
 msgid "Conditional Keys"
 msgstr "Chaves condicionais"
 
@@ -4114,6 +4117,12 @@ msgstr "Cruzamento de fronteiras"
 msgid "Crossing barriers"
 msgstr "Cruzamento de barreiras"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4346,6 +4355,12 @@ msgstr "Nenhuma regra últil para membro multipoligonal"
 msgid "Non-Way in multipolygon"
 msgstr "Elementos que não são caminhos estão no multipolígono"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Faltando nome:* tradução"
 
@@ -4572,30 +4587,30 @@ msgstr "Valor do atributo contém múltiplos espaços em branco"
 msgid "Property values contain HTML entity"
 msgstr "Valores de propriedade contêm entidade HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Key ''{0}'' parece ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Chave de propriedade com erros ortográficos"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "A chave ''{0}'' não está nas predefinições."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Key ''{0}'' parece ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Chave não incluída nas predefinições"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Valor \"{0}'' para a chave ''{1}'' parece ser ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "A chave ''{0}'' não está nas predefinições."
 
 msgid "Misspelled property value"
 msgstr "Erro ortográfico na propriedade do valor"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "O valor ''{0}'' para a chave ''{1}'' não está nas predefinições."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Valor \"{0}'' para a chave ''{1}'' parece ser ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Valor não incluído nas predefinições"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "O valor ''{0}'' para a chave ''{1}'' não está nas predefinições."
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4847,9 +4862,6 @@ msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 "Este teste verifica a direção dos caminhos de água, de terra e de litoral."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Linha costeira invertida: sem terra do lado esquerdo"
-
 msgid "Reversed land: land not on left side"
 msgstr "Terra invertida: sem terra do lado esquerdo"
 
@@ -5406,9 +5418,6 @@ msgstr "A longitude geográfica na posição do ponteiro do mouse."
 msgid "System of measurement changed to {0}"
 msgstr "Sistema de medidas mudado para {0}"
 
-msgid "Layer not in list."
-msgstr "camada não está na lista."
-
 msgid "Default (open, closed, new)"
 msgstr "Padrão (aberto, fechado, novo)"
 
@@ -5428,7 +5437,7 @@ msgid "Click to cancel the current operation"
 msgstr "Clique para cancelar a operação atual"
 
 msgid "In background"
-msgstr "No fundo"
+msgstr "Em segundo plano"
 
 msgid "Click to run job in background"
 msgstr "Clique para executar o tarefa em segundo plano"
@@ -6961,6 +6970,9 @@ msgstr "Classificar notas"
 msgid "Sort"
 msgstr "Classificar"
 
+msgid "Open the note in an external browser"
+msgstr "Abrir a nota em um navegador externo"
+
 msgid "Object type:"
 msgstr "Tipo de objeto:"
 
@@ -7213,6 +7225,14 @@ msgid "Download the content of the selected changesets from the server"
 msgstr ""
 "Baixar do servidor o conteúdo dos conjuntos de alterações selecionados"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Meus conjuntos de alterações"
 
@@ -8624,9 +8644,6 @@ msgstr "Entre com um nome de local para buscar"
 msgid "Areas around places"
 msgstr "Áreas em volta de lugares"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer exception, provavelmente faltam algumas tags."
-
 msgid "Search ..."
 msgstr "Buscar ..."
 
@@ -9264,6 +9281,9 @@ msgstr "Modificações não salvas - Salvar/Enviar antes de sair?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Modificações não salvas - Salvar/Enviar antes de apagar?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Enviando e salvando camadas modificadas..."
 
@@ -9331,6 +9351,12 @@ msgstr "Sair agora!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Saindo do JOSM sem salvar. Mudanção não salvas serão perdidas."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Apagar agora!"
 
@@ -9345,6 +9371,12 @@ msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 "Sair do JOSM salvando. Mudanças não salvas serão enviadas e/ou salvas."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Realizar ações antes de apagar"
 
@@ -10426,8 +10458,8 @@ msgid ""
 msgstr ""
 "<html>Selecione todas as faixas que deseja exibir. Você pode selecionada uma "
 "série de faixas ou usar CTRL+Clique para selecionar uma em específicos. O "
-"mapa é atualizado ao vivo no fundo. Abra as URLs com um duplo-clique sobre "
-"elas. </Html>"
+"mapa é atualizado ao vivo em segundo plano. Abra as URLs com um duplo-clique "
+"sobre elas. </html>"
 
 msgid "Set track visibility for {0}"
 msgstr "Definir visibilidade da faixa para {0}"
@@ -11665,6 +11697,9 @@ msgstr "Desenhe setas oneway."
 msgid "Draw segment order numbers"
 msgstr "Desenhar número de sequência dos segmentos"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Desenhar os limites dos dados recebidos"
 
@@ -13956,6 +13991,9 @@ msgstr "Sucesso naimportação NMEA:"
 msgid "NMEA import failure!"
 msgstr "Falha na importação NMEA!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Null pointer exception, provavelmente faltam algumas tags."
+
 msgid "Note Files"
 msgstr "Arquivos de nota"
 
@@ -14351,6 +14389,9 @@ msgstr "Enviando dados..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "ID 0 inesperado para o primitivo osm encontrado"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "Baixando dados..."
 
@@ -16252,6 +16293,9 @@ msgstr "Tiris: DGM (Terrain model)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Modelo de superfície)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -16363,8 +16407,11 @@ msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16545,6 +16592,9 @@ msgstr "Drone Imagery 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drone Imagery Canaan(Haiti) November 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortophoto 2000"
 
@@ -16839,18 +16889,6 @@ msgstr "Freemap.sk Cyclo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Ski"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakia Historic Maps"
 
@@ -16860,6 +16898,9 @@ msgstr "RABA-KGZ: Slovenia farmland use"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slovenia built-up areas"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
@@ -16992,6 +17033,9 @@ msgstr "U.S. Forest Service roads"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr "7ª Series (OS7)"
 
@@ -17388,6 +17432,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Baixa dados OSM ao longo de uma via"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17530,6 +17577,9 @@ msgstr ""
 "cria um canal digraph e verifica se um subconjunto de canais é uma junção ou "
 "pesquisa em um subconjunto de canais de junções"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Ajuda vectorizing imagens WMS."
 
@@ -17779,6 +17829,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Torna casas com terraço em de blocos individuais."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17810,6 +17865,9 @@ msgstr ""
 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 ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17980,6 +18038,10 @@ msgid "No wheeled vehicle"
 msgstr "Impossível para veículos de rodas"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "campo"
 
@@ -19308,6 +19370,9 @@ msgstr "em construção"
 msgid "Ford"
 msgstr "Vau"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Vias"
 
@@ -19318,34 +19383,37 @@ msgid "Tracktype"
 msgstr "Tipo de trilha"
 
 msgid "grade1"
-msgstr "grade1"
+msgstr "grau 1"
 
 msgid "Solid: paved or heavily compacted hardcore surface"
-msgstr ""
+msgstr "Sólido: superfície pavimentada ou fortemente compactada"
 
 msgid "grade2"
-msgstr "grade2"
+msgstr "grau 2"
 
 msgid "Mostly Solid: gravel/rock with some soft material mixed in"
 msgstr ""
+"Majoritariamente Sólido: cascalho ou pedras com algum material mais macio"
 
 msgid "grade3"
-msgstr "grade3"
+msgstr "grau 3"
 
 msgid "Even mixture of hard and soft materials"
-msgstr ""
+msgstr "Superfície mista entre materiais sólidos e macios"
 
 msgid "grade4"
-msgstr "grade4"
+msgstr "grau 4"
 
 msgid "Mostly Soft: soil/sand/grass with some hard material mixed in"
 msgstr ""
+"Majoritariamente Macio: superfície como solo, areia ou grama misturada com "
+"algum material sólido"
 
 msgid "grade5"
-msgstr "grade5"
+msgstr "grau 5"
 
 msgid "Soft: soil/sand/grass"
-msgstr ""
+msgstr "Macio: solo, areia ou grama"
 
 msgid "MTB Scale"
 msgstr "Escala MTB"
@@ -19633,7 +19701,7 @@ msgid "tiger"
 msgstr "tigre"
 
 msgid "Button operated"
-msgstr "Botão acionado"
+msgstr "Botão acionador"
 
 msgid "Sound signals"
 msgstr "Sinais sonoros"
@@ -20949,6 +21017,9 @@ msgstr "Pista"
 msgid "Taxiway"
 msgstr "Pista de taxiamento"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Heliponto"
 
@@ -21263,7 +21334,7 @@ msgid "Water Park"
 msgstr "Parque Aquático"
 
 msgid "Beach Resort"
-msgstr ""
+msgstr "Resort de Praia"
 
 msgid "Swimming Pool"
 msgstr "Piscina"
@@ -21339,7 +21410,7 @@ msgid "Arts Centre"
 msgstr "Centro Cultural"
 
 msgid "Artwork"
-msgstr "Arte"
+msgstr "Obra de arte"
 
 msgid "mural"
 msgstr "mural"
@@ -21622,11 +21693,11 @@ msgstr "Número do Ponto"
 msgid "Point Name"
 msgstr "Nome do ponto"
 
-msgid "Phone Number"
-msgstr "Número de telefone"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Use código internacional, como +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinária"
@@ -21635,11 +21706,17 @@ msgid "Emergency"
 msgstr "Emergência"
 
 msgid "Ambulance Station"
-msgstr "Pronto-socorro"
+msgstr "Posto de ambulância"
 
 msgid "Automated Defibrillator"
 msgstr "Desfibrilador automático"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Número de telefone"
+
 msgid "Located inside a building?"
 msgstr "Localizado dentro de um prédio?"
 
@@ -22074,7 +22151,7 @@ msgid "Sports Centre"
 msgstr "Centro de Esportes"
 
 msgid "Fitness Centre"
-msgstr ""
+msgstr "Academia/Centro fitness"
 
 msgid "Pitch"
 msgstr "Campo"
@@ -22509,6 +22586,10 @@ msgid "university"
 msgstr "universidade"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "hospital"
 
@@ -22593,6 +22674,10 @@ msgid "public"
 msgstr "público"
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Andares"
 
@@ -22691,7 +22776,7 @@ msgid "observation"
 msgstr "observação"
 
 msgid "Flagpole"
-msgstr "Mastro"
+msgstr "Mastro de bandeira"
 
 msgid "Works"
 msgstr "Fábrica"
@@ -23919,10 +24004,10 @@ msgid "Deli (Fine Food)"
 msgstr "Deli (comida requintada)"
 
 msgid "Pastry"
-msgstr ""
+msgstr "Doçaria"
 
 msgid "Confectionery"
-msgstr ""
+msgstr "Confeitaria"
 
 msgid "Tea"
 msgstr "Chá"
@@ -24806,8 +24891,14 @@ msgstr "Reserva Natural"
 msgid "Scree"
 msgstr "Cascalho"
 
-msgid "An accumulation of loose rocks."
-msgstr "Um acúmulo de pedras soltas."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "Vegetação de Altitude"
@@ -25079,7 +25170,7 @@ msgid "House number"
 msgstr "Número da casa"
 
 msgid "Street name"
-msgstr "Nome do rua"
+msgstr "Nome da rua"
 
 msgid "Place name"
 msgstr "Nome do lugar"
@@ -25490,17 +25581,11 @@ msgstr "Rotas"
 msgid "Bicycle Route"
 msgstr "Rota de bicicleta"
 
-msgid "icn"
-msgstr "icn"
-
-msgid "ncn"
-msgstr "ncn"
-
-msgid "rcn"
-msgstr "rcn"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "lcn"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Rota de Mountain Biking"
@@ -25508,18 +25593,6 @@ msgstr "Rota de Mountain Biking"
 msgid "Hiking Route"
 msgstr "Rota de caminhada"
 
-msgid "iwn"
-msgstr "iwn"
-
-msgid "nwn"
-msgstr "nwn"
-
-msgid "rwn"
-msgstr "rwn"
-
-msgid "lwn"
-msgstr "lwn"
-
 msgid "infrastructure"
 msgstr "infra-estrutura"
 
@@ -25532,18 +25605,6 @@ msgstr "Rota de Caminhada"
 msgid "Riding Route"
 msgstr "Rota de Equitação"
 
-msgid "ihn"
-msgstr "internacional (ihn)"
-
-msgid "nhn"
-msgstr "nacional (nhn)"
-
-msgid "rhn"
-msgstr "regional (rhn)"
-
-msgid "lhn"
-msgstr "local (lhn)"
-
 msgid "Piste Route"
 msgstr "Rota de Pista de Esqui"
 
@@ -25736,9 +25797,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr "Mesmo valor de {0} e {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} sem {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} sem {1} ou {2}"
 
@@ -25748,6 +25820,12 @@ msgstr "{0} sem {1}, {2} ou {3}"
 msgid "{0} together with {1}"
 msgstr "{0} junto com {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "elemento incompleto: somente {0}"
 
@@ -25763,29 +25841,17 @@ msgstr "{0} junto com {1} e valores conflitantes"
 msgid "{0} on suspicious object"
 msgstr "{0} em objeto suspeito"
 
-msgid "restaurant without name"
-msgstr "restaurante sem nome"
-
-msgid "{0} used with {1}"
-msgstr "{0} use com {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "piscina natural"
 
 msgid "sport without physical feature"
 msgstr "esporte sem característica física"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} deve ser no nó onde {1} e {2} se cruzam"
-
 msgid "alternative name without {0}"
 msgstr "nome alternativo sem {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
-msgstr "uso incompleto de {0} em uma maneira sem {1}"
-
-msgid "Same value of {0} and {1}"
-msgstr "Mesmo valor de {0} e {1}"
+msgstr "uso incompleto de {0} em caminho sem {1}"
 
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Mesmo valor de {0}, {1} e {2}"
@@ -25793,9 +25859,6 @@ msgstr "Mesmo valor de {0}, {1} e {2}"
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} e {1} junta com {2} e valores conflitantes"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Combinação suspeita de etiquetas: {0} e {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25814,9 +25877,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} junto com {1} e {2}. Remover {1} e {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} está obsoleta"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' não tem sentido, use tags mais específicas, por exemplo, ''{1}''"
@@ -25883,11 +25955,17 @@ msgstr "Etiqueta inespecífica {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Definição de {0} está incerta"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} não é recomendado. Use a função Reverter Caminhos no menu Ferramentas."
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "chave com caráter incomum"
 
@@ -25903,7 +25981,7 @@ msgstr "{0} é depreciado para {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} é depreciado. Use o prefixo-chave: {1} em vez disso."
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25948,8 +26026,8 @@ msgstr "Sobreposição de áreas naturais idênticas"
 msgid "Overlapping Identical Landuses"
 msgstr "Sobreposição de landuses idênticos"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} precisa estar conectado à uma via"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "pontos conectam via aquática e ponte"
@@ -25982,6 +26060,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} deve ser no nó onde {1} e {2} se cruzam"
+
 msgid "abbreviated street name"
 msgstr "nome da rua abreviado"
 
@@ -26000,6 +26081,9 @@ msgstr "highway sem referência"
 msgid "temporary highway type"
 msgstr "tipo de estrada temporária"
 
+msgid "{0} used with {1}"
+msgstr "{0} use com {1}"
+
 msgid "street name contains ss"
 msgstr "nome da ruas contem ss"
 
@@ -26097,11 +26181,14 @@ msgstr "denominação judaica desconhecida"
 msgid "{0} is unnecessary"
 msgstr "{0} é desnecessário"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} é desnecessário para {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} não faz sentido"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Nós duplicando tags pai"
@@ -26362,6 +26449,27 @@ msgstr "Enviar Trilha GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Enviar trilhas para openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importando..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "Por favor, abra ou crie uma nova camada de dados antes de importar"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Escala:"
+
+msgid "unit(s) = "
+msgstr "unidade(s) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Mostra o perfil de elevação"
 
@@ -26718,6 +26826,404 @@ 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 "Total images:"
+msgstr "Total de imagens:"
+
+msgid "images"
+msgstr "imagens"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Criar camada do Mapillary"
+
+msgid "Start Mapillary layer"
+msgstr "Iniciar camada do 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 "Select pictures"
+msgstr "Selecionar imagens"
+
+msgid "Import pictures into sequence"
+msgstr "Importar imagens na sequência"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importar imagens na camada Mapillary em uma sequência"
+
+msgid "Join mode"
+msgstr "Join mode"
+
+msgid "Join/unjoin pictures"
+msgstr "Juntar/Desunir imagens"
+
+msgid "Join Mapillary pictures"
+msgstr "Junte-se ao Mapillary pictures"
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr "Enviar imagens"
+
+msgid "Upload Mapillary pictures"
+msgstr "Atualizar imagens do Mapillary"
+
+msgid "Upload pictures."
+msgstr "Enviar imagens."
+
+msgid "Walk mode"
+msgstr "Modo caminhada"
+
+msgid "Start walk mode"
+msgstr "Iniciar o modo de 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 "View in website"
+msgstr "Ver no site"
+
+msgid "Copy key"
+msgstr "Copiar chave"
+
+msgid "Copy key tag"
+msgstr "Copiar chave da tag"
+
+msgid "Edit on website"
+msgstr "Editar no site"
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr "Enviar"
+
+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 folder"
+msgstr "Selecione uma pasta"
+
+msgid "Explore"
+msgstr "Explorar"
+
+msgid "Select a directory"
+msgstr "Selecione um diretório"
+
+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 "Mapillary picture"
+msgstr "Mapillary foto"
+
+msgid "Open Mapillary window"
+msgstr "Abrir janela Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Mapillary diálogo"
+
+msgid "Open Mapillary main dialog"
+msgstr "Abrir 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 "Login"
+msgstr "Login"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Download mode"
+msgstr "Modo de download"
+
+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 "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 "Sigir imagem selecionada"
+
+msgid "Go forward"
+msgstr "Ir para a frente"
+
+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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -27227,8 +27733,8 @@ msgstr ""
 "  <li>Opcionalmente, <b>altere o ponto do eixo de rotação</br>. A fim de "
 "ficar em paralelo com o segmento de referência, o segmento a ser alinhado "
 "vai girar em torno deste ponto. Você pode escolher as duas extremidades ou o "
-"centro do segmento <b><i><span "
-"style=\"color:green\">clicando</span></i></b>próximo.\n"
+"centro do segmento <b><i><span style=\"color:green\">clicando</span></i></b> "
+"próximo.\n"
 "  </li>\n"
 "</ul>\n"
 "</div>\n"
@@ -28586,9 +29092,6 @@ 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"
 
@@ -28621,9 +29124,6 @@ msgstr "Chat privado"
 msgid "Close tab"
 msgstr "Fechar aba"
 
-msgid "Logout"
-msgstr "Logout"
-
 msgid "Clear log"
 msgstr "Limpar log"
 
@@ -29209,9 +29709,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29402,21 +29899,9 @@ msgstr "Imagens importadas"
 msgid "Import vector graphics"
 msgstr "Importar gráficos vetoriais"
 
-msgid "Scale:"
-msgstr "Escala:"
-
-msgid "unit(s) = "
-msgstr "unidade(s) = "
-
-msgid "Importing..."
-msgstr "Importando..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "Arquivo SVG[ImportVec plugin] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Por favor, abra ou crie uma nova camada de dados antes de importar"
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29629,6 +30114,61 @@ msgstr "Número de {0} -vias junções encontrado: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "gerar todas as combinações de entrada/saída dos candidatos"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Substituir geometria"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Direção do índice ''{0}'' não encontrado"
 
@@ -29883,403 +30423,6 @@ msgstr "Ativa o plugin MapDust bug reporter"
 msgid "Missing input data"
 msgstr "Faltando dados de entrada"
 
-msgid "Mapillary Images"
-msgstr "Mapillary Imagens"
-
-msgid "Mapillary layer"
-msgstr "Mapillary camada"
-
-msgid "Total images:"
-msgstr "Total de imagens:"
-
-msgid "images"
-msgstr "imagens"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Criar camada do Mapillary"
-
-msgid "Start Mapillary layer"
-msgstr "Iniciar camada do 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 "Select pictures"
-msgstr "Selecionar imagens"
-
-msgid "Import pictures into sequence"
-msgstr "Importar imagens na sequência"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importar imagens na camada Mapillary em uma sequência"
-
-msgid "Join mode"
-msgstr "Join mode"
-
-msgid "Join/unjoin pictures"
-msgstr "Juntar/Desunir imagens"
-
-msgid "Join Mapillary pictures"
-msgstr "Junte-se ao Mapillary pictures"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr "Enviar imagens"
-
-msgid "Upload Mapillary pictures"
-msgstr "Atualizar imagens do Mapillary"
-
-msgid "Upload pictures."
-msgstr "Enviar imagens."
-
-msgid "Walk mode"
-msgstr "Modo caminhada"
-
-msgid "Start walk mode"
-msgstr "Iniciar o modo de 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 "Uploaded {0} images"
-msgstr "Enviadas {0} imagens"
-
-msgid "Approve upload on the website"
-msgstr "Aprovar upload no site"
-
-msgid "View in website"
-msgstr "Ver no site"
-
-msgid "Copy key"
-msgstr "Copiar chave"
-
-msgid "Copy key tag"
-msgstr "Copiar chave da tag"
-
-msgid "Edit on website"
-msgstr "Editar no site"
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr "Enviar"
-
-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 folder"
-msgstr "Selecione uma pasta"
-
-msgid "Explore"
-msgstr "Explorar"
-
-msgid "Select a directory"
-msgstr "Selecione um diretório"
-
-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 "Mapillary picture"
-msgstr "Mapillary foto"
-
-msgid "Open Mapillary window"
-msgstr "Abrir janela Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Mapillary diálogo"
-
-msgid "Open Mapillary main dialog"
-msgstr "Abrir 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 formuto 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 "Download mode"
-msgstr "Modo de download"
-
-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 "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 "Sigir imagem selecionada"
-
-msgid "Go forward"
-msgstr "Ir para a frente"
-
-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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"A área do OSM baixada é muito grande. Função Baixar foi alterada para "
-"semiautomática até a camada reiniciar."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Valores medidos"
 
@@ -31831,6 +31974,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "movido"
+
 msgid "rail"
 msgstr "trilho"
 
@@ -31928,9 +32074,6 @@ msgstr "Pegar"
 msgid "Join"
 msgstr "Entrar"
 
-msgid "moved"
-msgstr "movido"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Transporte Público: Junte-se a paradas GTFS"
 
@@ -32993,6 +33136,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terraço"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr "To-fix"
 
@@ -33470,6 +33673,84 @@ msgstr "Escolha uma data de validade para a chave:"
 msgid "Create a new signing key"
 msgstr "Criar uma nova chave de assinatura"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Avançar"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Voltar"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Sem tal faixa."
 
@@ -34443,9 +34724,6 @@ msgstr "Encontre primitivos com estas tags"
 msgid "Multitag Background: highlight"
 msgstr "Multitag Background: realce"
 
-msgid "Replace Geometry"
-msgstr "Substituir geometria"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Substituir a geometria do objecto selecionado por uma nova"
 
@@ -34487,8 +34765,8 @@ 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 todos os nós com propriedades ou "
-"relação associações a menos que eles pertencem a ambos os sentidos."
+"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 ""
@@ -34659,15 +34937,9 @@ msgstr "iniciar/pausar a reprodução de vídeo"
 msgid "Video: {0}"
 msgstr "Vídeo: {0}"
 
-msgid "Backward"
-msgstr "Voltar"
-
 msgid "jumps n sec back"
 msgstr "pula n segundos para trás"
 
-msgid "Forward"
-msgstr "Avançar"
-
 msgid "jumps n sec forward"
 msgstr "pula n segundos para frente"
 
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index a2da482..ac36728 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:23+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:04+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 52717e8..1495c4e 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:24+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:04+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "X-Poedit-Country: ROMANIA\n"
 "Language: ro\n"
 "X-Poedit-Language: Romanian\n"
@@ -222,18 +222,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Adaugă strat de fundal {0}"
 
-msgid "Error"
-msgstr "Eroare"
-
-msgid "Select image format for WMS layer"
-msgstr "Alege formatul raster pentru stratul WMS"
-
-msgid "Select WMS layers"
-msgstr "Alege straturile WMS"
-
-msgid "Add layers"
-msgstr "Adaugă straturi"
-
 msgid "Invalid service URL."
 msgstr "Adresa serviciului invalidă"
 
@@ -246,6 +234,18 @@ msgstr "Nu am putut obține lista cu straturile WMS"
 msgid "Could not parse WMS layer list."
 msgstr "Nu am putut parcurge lista de straturi WMS."
 
+msgid "Error"
+msgstr "Eroare"
+
+msgid "Select image format for WMS layer"
+msgstr "Alege formatul raster pentru stratul WMS"
+
+msgid "Select WMS layers"
+msgstr "Alege straturile WMS"
+
+msgid "Add layers"
+msgstr "Adaugă straturi"
+
 msgid "Add Node..."
 msgstr "Adaugă Nod..."
 
@@ -3330,9 +3330,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3736,10 +3733,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3776,6 +3773,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3785,6 +3785,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3821,6 +3824,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4039,6 +4048,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4249,30 +4264,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4516,9 +4531,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5039,9 +5051,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "stratul nu este în listă."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6463,6 +6472,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tip obiect:"
 
@@ -6702,6 +6714,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7974,9 +7994,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8540,6 +8557,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8591,6 +8611,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8603,6 +8629,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10660,6 +10692,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12744,6 +12779,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13106,6 +13144,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14749,6 +14790,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14860,7 +14904,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15039,6 +15086,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15333,18 +15383,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15354,6 +15392,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15486,6 +15527,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15853,6 +15897,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15967,6 +16014,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16164,6 +16214,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16186,6 +16241,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16342,6 +16400,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17662,6 +17724,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19281,6 +19346,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19951,10 +20019,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19969,6 +20037,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20838,6 +20912,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20922,6 +21000,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23127,7 +23209,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23794,16 +23882,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23812,18 +23894,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23836,18 +23906,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24040,9 +24098,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24052,6 +24121,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24067,39 +24142,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24118,9 +24178,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24175,10 +24244,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24194,7 +24269,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24239,7 +24314,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24273,6 +24348,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24291,6 +24369,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24381,10 +24462,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24630,6 +24714,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24968,3267 +25073,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "No address nodes inside buildings found"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "on polygon"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29690,6 +29832,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29785,9 +29930,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30799,6 +30941,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31246,6 +31448,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32072,9 +32352,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32268,15 +32545,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index 281abc9..2b53024 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-31 12:38+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-01 07:58+0000\n"
 "Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
 "Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:25+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:05+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ru_RU\n"
 
 msgid "Use OAuth"
@@ -63,7 +63,7 @@ msgid "Background Terms of Use"
 msgstr "Условия использования подложки"
 
 msgid "Opening link not supported on current platform (''{0}'')"
-msgstr "Переход по ссылке не поддерживается на данной платформе (''{0}'')"
+msgstr "Открытие ссылки не поддерживается на текущей платформе (''{0}'')"
 
 msgid "Executing platform startup hook"
 msgstr "Исполнение стартовых процедур"
@@ -75,19 +75,19 @@ msgid "Help"
 msgstr "Справка"
 
 msgid "Initializing OSM API"
-msgstr "Инициализация OSM API"
+msgstr "Инициализация API OSM"
 
 msgid "Initializing validator"
 msgstr "Инициализация валидатора"
 
 msgid "Initializing presets"
-msgstr "Инициализируются заготовки"
+msgstr "Инициализация заготовок"
 
 msgid "Initializing map styles"
 msgstr "Инициализация стилей карты"
 
 msgid "Loading imagery preferences"
-msgstr "Загрузка настроек подложек"
+msgstr "Загрузка настроек изображения"
 
 msgid "Updating user interface"
 msgstr "Обновление интерфейса пользователя"
@@ -227,18 +227,6 @@ msgstr "Выделить на карте объекты, выбранные в 
 msgid "Add imagery layer {0}"
 msgstr "Добавить слой снимка {0}"
 
-msgid "Error"
-msgstr "Ошибка"
-
-msgid "Select image format for WMS layer"
-msgstr "Выберите формат изображения для WMS слоя"
-
-msgid "Select WMS layers"
-msgstr "Выбрать WMS слои"
-
-msgid "Add layers"
-msgstr "Добавить слои"
-
 msgid "Invalid service URL."
 msgstr "Неверная ссылка сервиса WMS"
 
@@ -251,6 +239,18 @@ msgstr "Невозможно получить список слоев WMS."
 msgid "Could not parse WMS layer list."
 msgstr "Невозможно разобрать список слоев WMS."
 
+msgid "Error"
+msgstr "Ошибка"
+
+msgid "Select image format for WMS layer"
+msgstr "Выберите формат изображения для WMS слоя"
+
+msgid "Select WMS layers"
+msgstr "Выбрать WMS слои"
+
+msgid "Add layers"
+msgstr "Добавить слои"
+
 msgid "Add Node..."
 msgstr "Добавить точку..."
 
@@ -3642,9 +3642,6 @@ msgstr "Идентификатор набора матриц"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Слои не заданы документом getCapabilities: {0}"
 
-msgid "No layer selected"
-msgstr "Слой не выбран"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4078,12 +4075,12 @@ msgstr "Несколько отношений associatedStreet"
 msgid "House number without street"
 msgstr "Номер дома без указания улицы"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Дублирующийся номер дома «{0}»"
-
 msgid "Duplicate house numbers"
 msgstr "Повторяющиеся номера домов"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Дублирующийся номер дома «{0}»"
+
 msgid "Multiple street names in relation"
 msgstr "Несколько названий улиц в отношении"
 
@@ -4118,6 +4115,9 @@ msgstr "Береговые линии"
 msgid "This test checks that coastlines are correct."
 msgstr "Этот тест проверяет правильность береговых линий."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Неверное направление береговой линии: земля не слева"
+
 msgid "Unconnected coastline"
 msgstr "Несоединённая береговая линия"
 
@@ -4127,6 +4127,9 @@ msgstr "Неупорядоченная береговая линия"
 msgid "Reversed coastline"
 msgstr "Обратная береговая линия"
 
+msgid "invalid coastline"
+msgstr "Неправильная береговая линия"
+
 msgid "Conditional Keys"
 msgstr "Ключи, зависящие от условий"
 
@@ -4163,6 +4166,12 @@ msgstr "Пересекающиеся границы"
 msgid "Crossing barriers"
 msgstr "Пересечение барьеров"
 
+msgid "Self crossing"
+msgstr "Самопересечение"
+
+msgid "Self-crossing ways"
+msgstr "Линии с самопересечением"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4403,6 +4412,12 @@ msgstr "Роль для участника мультиполигона зада
 msgid "Non-Way in multipolygon"
 msgstr "Не-линия в мультиполигоне"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr "Повторяющиеся участники мультиполигона с разными ролями"
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr "Повторяющиеся участники мультиполигона с одной ролью"
+
 msgid "Missing name:* translation"
 msgstr "Отсутствующий  перевод name:*"
 
@@ -4624,30 +4639,30 @@ msgstr "Значения содержат несколько пробелов п
 msgid "Property values contain HTML entity"
 msgstr "Значения содержат HTML разметку"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Ключ ''{0}'' похож на ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Опечатка в ключе свойства"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Ключа ''{0}'' нет в заготовках."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Ключ ''{0}'' похож на ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Заготовки не содержат подходящего ключа"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Значение ''{0}'' ключа ''{1}'' выглядит похожим на ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Ключа ''{0}'' нет в заготовках."
 
 msgid "Misspelled property value"
 msgstr "Опечатка в значении"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Значения ''{0}'' для ключа ''{1}'' нет в заготовках"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Значение ''{0}'' ключа ''{1}'' выглядит похожим на ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "В заготовках нет подходящего значения"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Значения ''{0}'' для ключа ''{1}'' нет в заготовках"
+
 msgid "FIXMES"
 msgstr "Теги FIXME (к исправлению)"
 
@@ -4712,10 +4727,10 @@ msgid "Unknown member type"
 msgstr "Неизвестный тип участника"
 
 msgid "More than one \"from\" way found"
-msgstr "Обнаружен больше чем один путь \"откуда\""
+msgstr "Обнаружена больше чем одна линия \"from\" (откуда)"
 
 msgid "More than one \"to\" way found"
-msgstr "Обнаружен больше чем один путь \"куда\""
+msgstr "Обнаружена больше чем одна линия \"to\" (куда)"
 
 msgid "More than one \"via\" node found"
 msgstr "Найдена более чем одна точка \"via\""
@@ -4724,23 +4739,23 @@ msgid "Cannot mix node and way for role \"via\""
 msgstr "Нельзя использовать точку и линию совместно в качестве \"via\"."
 
 msgid "No \"from\" way found"
-msgstr "Не указан путь \"откуда\""
+msgstr "Не указана линия \"from\" (откуда)"
 
 msgid "No \"to\" way found"
-msgstr "Не указан путь \"куда\""
+msgstr "Не указана линия \"to\" (куда)"
 
 msgid "\"from\" way equals \"to\" way"
 msgstr "линия \"from\"  идентична линии \"to\""
 
 msgid "No \"via\" node or way found"
-msgstr "Нет точки или пути \"через\""
+msgstr "Отсутствует точка или линия \"via\" (через)"
 
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Линия \"from\" не начинается или не заканчивается на точке \"via\"."
 
 msgid "Superfluous turnrestriction as \"to\" way is oneway"
 msgstr ""
-"Лишнее ограничение на поворот: путь \"куда\" - одностороннее движение"
+"Лишнее ограничение на поворот: линия \"to\" (куда) - одностороннее движение"
 
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Линия \"to\" не начинается или не заканчивается на точке \"via\"."
@@ -4896,9 +4911,6 @@ msgstr "Неправильно упорядоченные линии"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Этот тест проверяет направление береговых линий."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Неверное направление береговой линии: земля не слева"
-
 msgid "Reversed land: land not on left side"
 msgstr "Неверное направление линии суши: земля не слева"
 
@@ -5168,7 +5180,7 @@ msgstr ""
 "selection."
 
 msgid "Log level is at {0} ({1}, {2})"
-msgstr ""
+msgstr "Уровень журналирования: {0} ({1}, {2})"
 
 msgid "Plugin loading skipped"
 msgstr "Скачивание модулей пропущено"
@@ -5462,9 +5474,6 @@ msgstr "Географическая долгота положения курс
 msgid "System of measurement changed to {0}"
 msgstr "Система измерений изменена на {0}"
 
-msgid "Layer not in list."
-msgstr "слоя нет в списке."
-
 msgid "Default (open, closed, new)"
 msgstr "По умолчанию (открытые, закрытые, новые)"
 
@@ -7032,6 +7041,9 @@ msgstr "Сортировать заметки"
 msgid "Sort"
 msgstr "Сортировать"
 
+msgid "Open the note in an external browser"
+msgstr "Открыть заметку во внешнем браузере"
+
 msgid "Object type:"
 msgstr "Тип объекта:"
 
@@ -7282,6 +7294,15 @@ msgstr "Скачать с сервера содержимое пакета пр
 msgid "Download the content of the selected changesets from the server"
 msgstr "Скачать с сервера содержимое выделенных пакетов правок"
 
+msgid "Download changed objects"
+msgstr "Скачать изменённые объекты"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+"Скачать текущую версию изменённых объектов в выбранных пакетах правок"
+
 msgid "My changesets"
 msgstr "Мои пакеты правок"
 
@@ -8691,9 +8712,6 @@ msgstr "Введите название места для поиска"
 msgid "Areas around places"
 msgstr "Области вокруг мест"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Пустой указатель ошибки, возможно, есть отсутствующие теги"
-
 msgid "Search ..."
 msgstr "Найти ..."
 
@@ -9346,6 +9364,9 @@ msgstr ""
 "Несохранённые изменения - Сохранить локально или передать на сервер перед "
 "удалением?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "Несохранённые изменения - cохранить/передать перед перезапуском?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Передача на сервер и сохранение изменённых слоёв ..."
 
@@ -9425,6 +9446,13 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "Выйти из  JOSM без сохранения. Несохранённые изменения будут утеряны."
 
+msgid "Restart now!"
+msgstr "Перезапустить сейчас!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+"Перезапустить JOSM без сохранения. Несохранённые изменения будут потеряны."
+
 msgid "Delete now!"
 msgstr "Удалить сейчас!"
 
@@ -9439,6 +9467,14 @@ msgstr ""
 "Выход из JOSM с сохранением. Несохранённые изменение будут сохранены "
 "локально или переданы на сервер."
 
+msgid "Perform actions before restarting"
+msgstr "Выполнить действия перед перезапуском"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+"Перезапустить JOSM с сохранением. Несохранённые изменения будут переданы на "
+"сервер и/или сохранены."
+
 msgid "Perform actions before deleting"
 msgstr "Выполнить действия перед удалением"
 
@@ -11791,6 +11827,9 @@ msgstr "Отображать стрелки одностороннего дви
 msgid "Draw segment order numbers"
 msgstr "Отображать порядковые номера сегментов"
 
+msgid "Draw segment order numbers on selected way"
+msgstr "Показывать порядковые номера сегментов на выделенной линии"
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Отображать границы скачанных данных"
 
@@ -14077,6 +14116,9 @@ msgstr "Успешный импорт NMEA данных:"
 msgid "NMEA import failure!"
 msgstr "Сбой при импорте NMEA!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Пустой указатель ошибки, возможно, есть отсутствующие теги"
+
 msgid "Note Files"
 msgstr "Файлы заметок"
 
@@ -14478,6 +14520,9 @@ msgstr "Передача данных на сервер ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Обнаружен неожиданный id 0 для элемента osm"
 
+msgid "Failed to evaluate {0}"
+msgstr "Не удалось выполнить {0}"
+
 msgid "Downloading data..."
 msgstr "Скачивание данных..."
 
@@ -15908,11 +15953,10 @@ msgid "Your current version of JOSM is {0}"
 msgstr "Ваша текущая версия JOSM: {0}"
 
 msgid "JOSM is searching for updates..."
-msgstr "JOSM выполняет поиск обновлений..."
+msgstr "Поиск обновлений JOSM..."
 
 msgid "An error occured while checking if your JOSM instance is up to date."
-msgstr ""
-"Произошла ошибка при проверке актуальности версии вашего экземпляра JOSM."
+msgstr "Произошла ошибка во время проверки обновлений JOSM."
 
 msgid "JOSM is up to date."
 msgstr "У вас самая новая версия JOSM."
@@ -16425,6 +16469,9 @@ msgstr "Tiris: DGM (модель рельефа)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (модель поверхности)"
 
+msgid "Tiris: contour lines"
+msgstr "Tiris: горизонтали"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Вена: многоцелевая карта (общего назначения)"
 
@@ -16536,8 +16583,11 @@ msgstr "Geodatastyrelsen: кадастровые участки по INSPIRE"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6 м"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr "Дания: отмывка рельефа SDFE (40 см)"
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr "Дания: отмывка поверхности SDFE 40 см)"
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16715,6 +16765,9 @@ msgstr "Снимки с дрона 2014 (Гаити)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Canaan (Гаити) - съёмка с дрона, ноябрь 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr "Matthew (Гаити) - съёмка с дрона, октябрь 2016"
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ортофото 2000"
 
@@ -17009,18 +17062,6 @@ msgstr "Freemap.sk (велокарта)"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk (лыжные трассы)"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Кадастровая карта Словакии (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Кадастровая карта Словакии (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Словакия EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Словакия EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Словакия: исторические карты"
 
@@ -17030,6 +17071,9 @@ msgstr "RABA-KGZ: Словения - использование сельхозз
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Словения - области застройки"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "Кейптаун, аэрофотосъёмка 2015"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Южная Африка CD:NGI аэрофотосъёмка"
 
@@ -17163,6 +17207,9 @@ msgstr "U.S. Forest Service - дороги"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Украина - ортофото 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Украина - Киев 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "7-й выпуск (OS7)"
 
@@ -17558,6 +17605,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Загрузка данных OSM вдоль линии"
 
+msgid "Dxf Import"
+msgstr "Импорт dxf"
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17706,6 +17756,9 @@ msgstr ""
 "Создание каналов ориентированного графа (орграфа) и проверка их на наличие "
 "соединений или поиск соединений в них."
 
+msgid "Tools to help import Kartverket N50"
+msgstr "Инструменты, помогающие в импорте Kartverket N50"
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 "Помогает векторизовать изображения WMS. Не развивается и считается "
@@ -17959,6 +18012,12 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Сделать ряд домов вдоль улицы из одного блока."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+"Добавляет диалог списка задач, упрощающий обработку больших списков объектов"
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17990,6 +18049,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Модуль для цифровой подписи данных OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr "Редактор тегов движения по полосам на дорогах"
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18160,6 +18222,10 @@ msgid "No wheeled vehicle"
 msgstr "Непроходимо ни для какой колёсной техники"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr "верховая езда"
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "спортивное поле"
 
@@ -18371,7 +18437,7 @@ msgid "indian"
 msgstr "индийская"
 
 msgid "regional"
-msgstr "местная"
+msgstr "региональная"
 
 msgid "kebab"
 msgstr "шашлык"
@@ -19488,6 +19554,9 @@ msgstr "строящаяся дорога"
 msgid "Ford"
 msgstr "Брод"
 
+msgid "stepping_stones"
+msgstr "переход по камням"
+
 msgid "Ways"
 msgstr "Линии"
 
@@ -20074,7 +20143,7 @@ msgid "Bump Gate"
 msgstr "Ворота, открываемые бампером"
 
 msgid "Kissing Gate"
-msgstr "Узкая калитка"
+msgstr "Ворота \"Kissing Gate\""
 
 msgid "Chain"
 msgstr "Цепь"
@@ -20172,13 +20241,13 @@ msgid "Basin"
 msgstr "Сточный бассейн"
 
 msgid "retention"
-msgstr ""
+msgstr "паводкоаккумулирующий"
 
 msgid "infiltration"
 msgstr "инфильтрационный"
 
 msgid "detention"
-msgstr ""
+msgstr "сухой паводкоаккумулирующий"
 
 msgid "Reservoir"
 msgstr "Резервуар"
@@ -21133,6 +21202,9 @@ msgstr "Взлётно-посадочная полоса"
 msgid "Taxiway"
 msgstr "Рулёжная дорожка"
 
+msgid "Holding Position"
+msgstr "Предварительный старт"
+
 msgid "Helipad"
 msgstr "Вертолётная площадка"
 
@@ -21803,11 +21875,11 @@ msgstr "Номер пункта"
 msgid "Point Name"
 msgstr "Название точки"
 
-msgid "Phone Number"
-msgstr "Номер телефона"
+msgid "Emergency Phone Number"
+msgstr "Телефон экстренной службы"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Используйте международный код, например: +7-916-0857403)"
+msgid "(Use number as shown on plate.)"
+msgstr "(Введите номер так, как он указан на табличке.)"
 
 msgid "Veterinary"
 msgstr "Ветеринария"
@@ -21821,6 +21893,12 @@ msgstr "Станция скорой помощи"
 msgid "Automated Defibrillator"
 msgstr "Автоматизированный дефибриллятор"
 
+msgid "Location description"
+msgstr "Описание местонахождения"
+
+msgid "Phone Number"
+msgstr "Номер телефона"
+
 msgid "Located inside a building?"
 msgstr "Расположен внутри здания?"
 
@@ -22690,6 +22768,10 @@ msgid "university"
 msgstr "университет"
 
 msgctxt "building"
+msgid "college"
+msgstr "колледж"
+
+msgctxt "building"
 msgid "hospital"
 msgstr "больница"
 
@@ -22774,6 +22856,10 @@ msgid "public"
 msgstr "общественное"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "руины"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Этажи"
 
@@ -24987,9 +25073,14 @@ msgstr "Заповедник"
 msgid "Scree"
 msgstr "Каменистая осыпь"
 
-msgid "An accumulation of loose rocks."
-msgstr ""
-"Скопление обломков горных пород, осыпающихся в результате выветривания."
+msgid "An accumulation of loose angular rocks."
+msgstr "Скопление угловатых камней или обломков горных пород."
+
+msgid "Shingle"
+msgstr "Галька"
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr "Скопление скруглённых камней на пляже или берегу реки."
 
 msgid "Fell"
 msgstr "Каменистая пустошь"
@@ -25669,17 +25760,11 @@ msgstr "Маршруты"
 msgid "Bicycle Route"
 msgstr "Велосипедный маршрут"
 
-msgid "icn"
-msgstr "международная"
-
-msgid "ncn"
+msgid "national"
 msgstr "национальная"
 
-msgid "rcn"
-msgstr "региональная"
-
-msgid "lcn"
-msgstr "местная"
+msgid "local"
+msgstr "локальная"
 
 msgid "Mountain Biking Route"
 msgstr "Маршрут горных велосипедов"
@@ -25687,18 +25772,6 @@ msgstr "Маршрут горных велосипедов"
 msgid "Hiking Route"
 msgstr "Пеший туристический маршрут"
 
-msgid "iwn"
-msgstr "международная"
-
-msgid "nwn"
-msgstr "национальная"
-
-msgid "rwn"
-msgstr "региональная"
-
-msgid "lwn"
-msgstr "местная"
-
 msgid "infrastructure"
 msgstr "инфраструктура"
 
@@ -25711,18 +25784,6 @@ msgstr "Пеший маршрут"
 msgid "Riding Route"
 msgstr "Конный маршрут"
 
-msgid "ihn"
-msgstr "международная (ihn)"
-
-msgid "nhn"
-msgstr "национальная (nhn)"
-
-msgid "rhn"
-msgstr "региональная (rhn)"
-
-msgid "lhn"
-msgstr "локальная (lhn)"
-
 msgid "Piste Route"
 msgstr "Маршрут лыжни"
 
@@ -25915,9 +25976,22 @@ msgstr "Нечётный номер дома в интерполяции чёт
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr "Линия с {0}. По возможности отметьте каждый номер дома отдельно."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+"Объект не имеет {0}, но у него есть {1} и {2}, значение которых похоже на "
+"номер дома."
+
+msgid "Same value of {0} and {1}"
+msgstr "Одинаковые значения у  {0} и {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} без {1}"
 
+msgid "missing tag"
+msgstr "отсутствующий тег"
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} без {1} или {2}"
 
@@ -25927,6 +26001,12 @@ msgstr "{0} без {1}, {2} или {3}"
 msgid "{0} together with {1}"
 msgstr "{0} вместе с {1}"
 
+msgid "suspicious tag combination"
+msgstr "подозрительная комбинация тегов"
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr "два объекта, один с {0}, а второй с {1} + {2} + {3}"
+
 msgid "incomplete object: only {0}"
 msgstr "неполный объект: только {0}"
 
@@ -25942,39 +26022,24 @@ msgstr "{0} вместе с {1} и конфликтующие значения"
 msgid "{0} on suspicious object"
 msgstr "{0} на подозрительном объекте"
 
-msgid "restaurant without name"
-msgstr "тег restaurant без тега name"
-
-msgid "{0} used with {1}"
-msgstr "{0} использован с {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "тег natural water добавлен для плавательного бассейна"
 
 msgid "sport without physical feature"
 msgstr "тег sport без физического объекта"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} должен быть точкой пересечения {1} и {2}"
-
 msgid "alternative name without {0}"
 msgstr "альтернативное название без {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "неполное использование {0} для линии без {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Одинаковые значения у  {0} и {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Одинаковые значения у {0}, {1} и {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} и {1} вместе с {2} и конфликтующие значения"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Подозрительная комбинация тегов: {0} и {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} на отношении без {1}"
 
@@ -25999,9 +26064,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} вместе с {1} и {2}. Удалите {1} и {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Разное число полос движения в ключах {0} и {1}"
+
+msgid "possibly missing {0} tag"
+msgstr "возможно, пропущен тег {0}"
+
 msgid "{0} is deprecated"
 msgstr "{0} устарел"
 
+msgid "deprecated tagging"
+msgstr "нерекомендуемые теги"
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' невыразителен, используйте более характерные теги, например, ''{1}''"
@@ -26072,12 +26146,18 @@ msgstr "Неспецифичный тег {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Неточное определение {0}"
 
+msgid "{0} + {1} + {2}"
+msgstr "{0} + {1} + {2}"
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} не рекомендуется. Используйте функцию «Изменить направление линии» из "
 "меню «Инструменты»."
 
+msgid "{0}"
+msgstr "{0}"
+
 msgid "key with uncommon character"
 msgstr "ключ с необычным символом"
 
@@ -26093,8 +26173,8 @@ msgstr "{0} не рекомендуется для {1}"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} применять не рекомендуется. Используйте взамен префикс  {1}:"
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "вызывающий сомнения ключ (заканчивается числом): {0}"
+msgid "questionable key (ending with a number)"
+msgstr "вызывающий сомнения ключ (заканчивается числом)"
 
 msgid "The key {0} has an uncommon value."
 msgstr "Ключ {0} имеет необычное значение."
@@ -26138,8 +26218,8 @@ msgstr "Перекрывающиеся идентичные области об
 msgid "Overlapping Identical Landuses"
 msgstr "Перекрывающиеся идентичные землепользования"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} должен быть соединён с линией"
+msgid "isolated node which must be connected to a way"
+msgstr "отдельная точка, которая должна быть соединена с линией"
 
 msgid "node connects waterway and bridge"
 msgstr "точка соединяет водный путь и мост"
@@ -26176,6 +26256,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Береговая линия внутри {1}"
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} должен быть точкой пересечения {1} и {2}"
+
 msgid "abbreviated street name"
 msgstr "сокращённое обозначение улицы"
 
@@ -26194,6 +26277,9 @@ msgstr "тег highway без обозначения (ref)"
 msgid "temporary highway type"
 msgstr "временный тип дороги"
 
+msgid "{0} used with {1}"
+msgstr "{0} использован с {1}"
+
 msgid "street name contains ss"
 msgstr "название улицы содержит ss"
 
@@ -26292,11 +26378,14 @@ msgstr "неизвестная конфессия иудаизма"
 msgid "{0} is unnecessary"
 msgstr "{0} не нужен"
 
+msgid "unnecessary tag"
+msgstr "ненужный тег"
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} не нужно для {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} не имеет смысла"
+msgid "{0} makes no sense"
+msgstr "{0} не имеет смысла"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Точки с тегами как у родительской линии"
@@ -26558,6 +26647,27 @@ msgstr "Передача GPX трека на сервер"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Передача треков на сайт openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Импортирование..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr "Файлы DXF [модуль ImportDxf] (*.dxf)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Откройте или создайте слой данных перед импортом"
+
+msgid "Import dxf"
+msgstr "Импорт dxf"
+
+msgid "Scale:"
+msgstr "Масштаб:"
+
+msgid "unit(s) = "
+msgstr "единицы = "
+
+msgid "m"
+msgstr "м"
+
 msgid "Shows elevation profile"
 msgstr "Показывает профиль высоты"
 
@@ -26913,6 +27023,412 @@ msgstr "Импортировать геопривязанное изображе
 msgid "Error while creating image layer: "
 msgstr "Ошибка при создании слоя с изображением: "
 
+msgid "Mapillary Images"
+msgstr "Изображения Mapillary"
+
+msgid "Mapillary layer"
+msgstr "Слой Mapillary"
+
+msgid "Total images:"
+msgstr "Всего изображений:"
+
+msgid "images"
+msgstr "снимков"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "Шрифт дорожного знака в ''{0}'' имеет неправильный формат"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Не удалось прочитать файл шрифта из ''{0}''"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Создать слой Mapillary"
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr "Выберите изображения"
+
+msgid "Import pictures into sequence"
+msgstr "Импортировать изображения в последовательность"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Импортировать изображения в последовательность в слое Mapillary"
+
+msgid "Join mode"
+msgstr "Режим объединения"
+
+msgid "Join/unjoin pictures"
+msgstr "Соединить/разъединить снимки"
+
+msgid "Join Mapillary pictures"
+msgstr "Объединить снимки Mapillary"
+
+msgid "Submit changeset"
+msgstr "Передать пакет правок"
+
+msgid "Submit the current changeset"
+msgstr "Передать текущий пакет правок"
+
+msgid "Submit the current changeset to Mapillary"
+msgstr "Передать текущий  пакет правок в Mapillary"
+
+msgid "Upload pictures"
+msgstr "Отправить снимки"
+
+msgid "Upload Mapillary pictures"
+msgstr "Отправить снимки Mapillary"
+
+msgid "Upload pictures."
+msgstr "Отправить снимки."
+
+msgid "Walk mode"
+msgstr "Режим прогулки"
+
+msgid "Start walk mode"
+msgstr "Включить режим прогулки"
+
+msgid "Zoom to selected image"
+msgstr "Масштабировать до выбранного снимка"
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr "Приблизить вид до текущего выбранного снимка Mapillary"
+
+msgid "View in website"
+msgstr "Посмотреть на веб-сайте"
+
+msgid "Copy key"
+msgstr "Копировать ключ"
+
+msgid "Copy key tag"
+msgstr "Копировать тег"
+
+msgid "Edit on website"
+msgstr "Изменить на сайте"
+
+msgid "Current Mapillary changeset"
+msgstr "Текущий  пакет правок Mapillary"
+
+msgid "Open Mapillary changeset dialog"
+msgstr "Открыть диалог пакета правок Mapillary"
+
+msgid "Mapillary changeset"
+msgstr "Пакет правок Mapillary"
+
+msgid "Submit"
+msgstr "Передать"
+
+msgid "Export all images"
+msgstr "Экспортировать все снимки"
+
+msgid "Export selected sequence"
+msgstr "Экспортировать выбранную последовательность"
+
+msgid "Export selected images"
+msgstr "Экспортировать выбранные снимки"
+
+msgid "Rewrite imported images"
+msgstr "Перезаписать импортированные изображения"
+
+msgid "Select a folder"
+msgstr "Выберите папку"
+
+msgid "Explore"
+msgstr "Обзор"
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr "Снимок Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Открыть окно Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Диалог Mapillary"
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr "Войти"
+
+msgid "Logout"
+msgstr "Выйти"
+
+msgid "Download mode"
+msgstr "Режим скачивания"
+
+msgid "You are logged in as ''{0}''."
+msgstr "Вы вошли как ''{0}''."
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr "всё в видимой области"
+
+msgid "areas with downloaded OSM-data"
+msgstr "области со скачанными данными OSM"
+
+msgid "only when manually requested"
+msgstr "только при запросе вручную"
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+"Скачанная область OSM слишком велика. Режим загрузки изменён на область со "
+"скачанными данными OSM до следующего перезапуска слоя."
+
+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 "The image key ''{0}'' is invalid!"
+msgstr "Неверный идентификатор изображения ''{0}''!"
+
+msgid "The image key must not be null here!"
+msgstr "Идентификатор изображения здесь не должен иметь значение null!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "Неверный идентификатор последовательности ''{0}''!"
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+"Идентификатор последовательности здесь не должен иметь значение null!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -27666,7 +28182,7 @@ msgstr ""
 "градусов."
 
 msgid "There is no frame loaded !"
-msgstr ""
+msgstr "Фрейм не загружен!"
 
 msgid "Alert Message"
 msgstr "Предупреждение"
@@ -28777,9 +29293,6 @@ msgstr "Открыть панель GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Приблизьте, чтобы увидеть сообщения"
 
-msgid "Login"
-msgstr "Войти"
-
 msgid "Enable autologin"
 msgstr "Входить автоматически"
 
@@ -28813,9 +29326,6 @@ msgstr "Приватный чат"
 msgid "Close tab"
 msgstr "Закрыть вкладку"
 
-msgid "Logout"
-msgstr "Выйти"
-
 msgid "Clear log"
 msgstr "Очистить журнал"
 
@@ -29397,9 +29907,6 @@ msgstr "мм"
 msgid "cm"
 msgstr "см"
 
-msgid "m"
-msgstr "м"
-
 msgid "km"
 msgstr "км"
 
@@ -29586,21 +30093,9 @@ msgstr "Импортированные изображения"
 msgid "Import vector graphics"
 msgstr "Импорт векторной графики"
 
-msgid "Scale:"
-msgstr "Масштаб:"
-
-msgid "unit(s) = "
-msgstr "единицы = "
-
-msgid "Importing..."
-msgstr "Импортирование..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVG файлы [модуль ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Откройте или создайте слой данных перед импортом"
-
 msgid "Concourse wizard ..."
 msgstr "Помощник создания вестибюлей..."
 
@@ -29786,7 +30281,7 @@ msgid "Check "
 msgstr "Проверить "
 
 msgid "check the subset for junction properties"
-msgstr ""
+msgstr "проверить подмножество на наличие признаков соединений"
 
 msgid "Search "
 msgstr "Найти "
@@ -29816,6 +30311,65 @@ msgstr "Число найденных {0}-путевых соединений: {
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "создать все комбинации из кандидатов входа/выхода"
 
+msgid "Check the direction"
+msgstr "Проверьте направление"
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+"Проверьте направление выделенного ручья или реки. Оно правильное?\n"
+" Выполнено: "
+
+msgid "Correct"
+msgstr "Правильное"
+
+msgid "Wrong"
+msgstr "Неправильное"
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr "<HTML><U>П</U>равильное направление</HTML>"
+
+msgid "Direction of river is correct."
+msgstr "Направление реки правильное."
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr "<HTML><U>Н</U>еправильное направление</HTML>"
+
+msgid "Direction of river is wrong."
+msgstr "Направление реки неправильное."
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr "<HTML><U>И</U>гнорировать эту линию</HTML>"
+
+msgid "Ignore direction of this way."
+msgstr "Игнорировать направление этой линии."
+
+msgid "Check direction of streams"
+msgstr "Проверьте направление ручьёв"
+
+msgid "Check direction of streams and rivers"
+msgstr "Проверить направление ручёв и рек"
+
+msgid "No more directions to check!"
+msgstr "Больше нет объектов для проверки направлений!"
+
+msgid "Replace way"
+msgstr "Заменить линию"
+
+msgid "Replace way of selected way with a new way"
+msgstr "Заменить выбранную линию новой линией"
+
+msgid "Replace Geometry"
+msgstr "Заменить геометрию"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+"Этот инструмент заменяет одну береговую линию другой,  поэтому необходимо "
+"чтобы были выбраны две береговые линии."
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Индекс направлений ''{0}'' не найден"
 
@@ -30076,409 +30630,6 @@ msgstr "Включает модуль сообщений об ошибках Map
 msgid "Missing input data"
 msgstr "Входные данные отсутствуют"
 
-msgid "Mapillary Images"
-msgstr "Изображения Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Слой Mapillary"
-
-msgid "Total images:"
-msgstr "Всего изображений:"
-
-msgid "images"
-msgstr "снимков"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr "Шрифт дорожного знака в ''{0}'' имеет неправильный формат"
-
-msgid "Could not read font-file from ''{0}''"
-msgstr "Не удалось прочитать файл шрифта из ''{0}''"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Создать слой Mapillary"
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr "Выберите изображения"
-
-msgid "Import pictures into sequence"
-msgstr "Импортировать изображения в последовательность"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Импортировать изображения в последовательность в слое Mapillary"
-
-msgid "Join mode"
-msgstr "Режим объединения"
-
-msgid "Join/unjoin pictures"
-msgstr "Соединить/разъединить снимки"
-
-msgid "Join Mapillary pictures"
-msgstr "Объединить снимки Mapillary"
-
-msgid "Submit changeset"
-msgstr "Передать пакет правок"
-
-msgid "Submit the current changeset"
-msgstr "Передать текущий пакет правок"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Передать текущий  пакет правок в Mapillary"
-
-msgid "Upload pictures"
-msgstr "Отправить снимки"
-
-msgid "Upload Mapillary pictures"
-msgstr "Отправить снимки Mapillary"
-
-msgid "Upload pictures."
-msgstr "Отправить снимки."
-
-msgid "Walk mode"
-msgstr "Режим прогулки"
-
-msgid "Start walk mode"
-msgstr "Включить режим прогулки"
-
-msgid "Zoom to selected image"
-msgstr "Масштабировать до выбранного снимка"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Приблизить вид до текущего выбранного снимка Mapillary"
-
-msgid "Uploaded {0} images"
-msgstr "Отправлено {0} снимков"
-
-msgid "Approve upload on the website"
-msgstr "Подтвердить загрузку на веб-сайт"
-
-msgid "View in website"
-msgstr "Посмотреть на веб-сайте"
-
-msgid "Copy key"
-msgstr "Копировать ключ"
-
-msgid "Copy key tag"
-msgstr "Копировать тег"
-
-msgid "Edit on website"
-msgstr "Изменить на сайте"
-
-msgid "Current Mapillary changeset"
-msgstr "Текущий  пакет правок Mapillary"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Открыть диалог пакета правок Mapillary"
-
-msgid "Mapillary changeset"
-msgstr "Пакет правок Mapillary"
-
-msgid "Submit"
-msgstr "Передать"
-
-msgid "Export all images"
-msgstr "Экспортировать все снимки"
-
-msgid "Export selected sequence"
-msgstr "Экспортировать выбранную последовательность"
-
-msgid "Export selected images"
-msgstr "Экспортировать выбранные снимки"
-
-msgid "Rewrite imported images"
-msgstr "Перезаписать импортированные изображения"
-
-msgid "Select a folder"
-msgstr "Выберите папку"
-
-msgid "Explore"
-msgstr "Обзор"
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr "Снимок Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Открыть окно Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Диалог Mapillary"
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr "Режим скачивания"
-
-msgid "You are logged in as ''{0}''."
-msgstr "Вы вошли как ''{0}''."
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr "всё в видимой области"
-
-msgid "areas with downloaded OSM-data"
-msgstr "области со скачанными данными OSM"
-
-msgid "only when manually requested"
-msgstr "только при запросе вручную"
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"Загруженная область OSM слишком велика. Режим скачивания изменён на "
-"полуавтоматический до перезапуска слоя."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr "Неверный идентификатор изображения ''{0}''!"
-
-msgid "The image key must not be null here!"
-msgstr "Идентификатор изображения здесь не должен иметь значение null!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "Неверный идентификатор последовательности ''{0}''!"
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-"Идентификатор последовательности здесь не должен иметь значение null!"
-
 msgid "Measured values"
 msgstr "Измеренные значения"
 
@@ -31908,7 +32059,7 @@ msgid "Repeat last fix"
 msgstr "Повторить последнее исправление"
 
 msgid "Do you want to download referrers of platforms and stop positions?"
-msgstr ""
+msgstr "Вы хотите скачать связанные платформы и позиции остановки?"
 
 msgid "Remember my choice and do not ask me again in this session"
 msgstr "Запомнить мой выбор и больше не спрашивать в этом сеансе"
@@ -31929,7 +32080,7 @@ msgid "Download incomplete route relation members"
 msgstr "Скачать недостающих участников отношения маршрута"
 
 msgid "Include stop_area tests"
-msgstr ""
+msgstr "Включить тесты зон остановки"
 
 msgid "PT_Assistant plugin found that this relation (id={0}) has errors:"
 msgstr ""
@@ -31979,7 +32130,7 @@ msgid "Fix error"
 msgstr "Исправить ошибку"
 
 msgid "PT: dummy test warning"
-msgstr ""
+msgstr "PT: тестовое предупреждение"
 
 msgid "PT: Route contains a gap that can be fixed by sorting"
 msgstr "ОТ: Маршрут содержит разрыв, который может быть устранён сортировкой"
@@ -31997,7 +32148,7 @@ msgid "PT: Problem in the route segment"
 msgstr "ОТ: Проблема в сегменте маршрута"
 
 msgid "PT: Stop not served"
-msgstr ""
+msgstr "ОТ: Отсутствуют обслуживаемые остановки"
 
 msgid "PT: Problem in the route segment with no automatic fix"
 msgstr "ОТ: Проблема в сегменте маршрута без автоматического исправления"
@@ -32025,6 +32176,8 @@ msgid ""
 "PT: Route relations of stop position(s) and platform(s) of stop area members "
 "diverge"
 msgstr ""
+"ОТ: Участники маршрутов мест(а) остановки и платформ(ы), входящих в зону "
+"остановки, различаются"
 
 msgid "PT: Route type does not match the type of the road it passes on"
 msgstr ""
@@ -32038,6 +32191,9 @@ msgstr ""
 "ОТ: Маршрут проходит по дороге с односторонним движением в обратном "
 "направлении"
 
+msgid "moved"
+msgstr "перемещен"
+
 msgid "rail"
 msgstr "рельс"
 
@@ -32135,9 +32291,6 @@ msgstr "Поймать"
 msgid "Join"
 msgstr "Соединить"
 
-msgid "moved"
-msgstr "перемещен"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Общественный транспорт: Соединение GTFS остановок"
 
@@ -32841,10 +32994,10 @@ msgid "Select a map object"
 msgstr "Выделите объект карты"
 
 msgid "Shape actions panel"
-msgstr ""
+msgstr "Панель действий с формами"
 
 msgid "Shape mode control panel"
-msgstr ""
+msgstr "Панель управления формами"
 
 msgid "Rotate Mode:"
 msgstr "Режим вращения:"
@@ -32883,7 +33036,7 @@ msgid "Align all buildings"
 msgstr "Выровнять все здания"
 
 msgid "Delete overlay"
-msgstr ""
+msgstr "Удалить оверлей"
 
 msgid "Simplify Area"
 msgstr "Упростить полигон"
@@ -33189,6 +33342,71 @@ msgstr ""
 msgid "Terrace"
 msgstr "Ряд домов вдоль улицы"
 
+msgid "Pass over element without marking it"
+msgstr "Пропустить элемент, не отмечая его"
+
+msgid "Mark element done"
+msgstr "Отметить элемент как выполненный"
+
+msgid "Todo list"
+msgstr "Список задач"
+
+msgid "Open the todo list."
+msgstr "Открыть список задач."
+
+msgid "Zoom to the selected item in the todo list."
+msgstr "Масштабировать до выделенного элемента в списке задач."
+
+msgid "Select all Unmarked and Zoom"
+msgstr "Выделить все не отмеченные и масштабировать"
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+"Выделить и масштабировать до всех не отмеченных элементов списка задач."
+
+msgid "Pass"
+msgstr "Пропустить"
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+"Перейти к следующему элементу, оставив этот элемент в списке задач. ([)."
+
+msgid "Add the selected items to the todo list."
+msgstr "Добавить выделенные объекты в список задач."
+
+msgid "Mark selected"
+msgstr "Отметить выделенные"
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+"Отметить выделенные (на карте) объекты как выполненные в списке задач."
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr "Отметить выделенные объекты как выполненные в списке задач. (])."
+
+msgid "Mark all"
+msgstr "Отметить все"
+
+msgid "Mark all items in the todo list as done."
+msgstr "Отметить все объекты в списке задач как выполненные."
+
+msgid "Unmark all"
+msgstr "Снять отметку со всех"
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+"Снять отметку со всех элементов списка задач, ранее отмеченных как "
+"выполненные."
+
+msgid "Clear the todo list"
+msgstr "Очистить список задач"
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr "Убрать все элементы (отмеченные и неотмеченные) из списка задач."
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr "Список задач {0}/{1} ({2}%)"
+
 msgid "To-fix"
 msgstr "To-fix"
 
@@ -33662,6 +33880,87 @@ msgstr "Выберите дату истечения ключа:"
 msgid "Create a new signing key"
 msgstr "Создать новый ключ подписи"
 
+msgid "Turn lanes tagging - editor"
+msgstr "Редактор полос движения"
+
+msgid "Turn lanes tagging - Editor"
+msgstr "Редактор полос движения"
+
+msgid "turn lanes tagging - editor"
+msgstr "редактор полос движения"
+
+msgid "Turn Lanes Editor"
+msgstr "Редактор полос движения"
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr " Количество полос исправлено в соответствии с количеством поворотов"
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+" Количество lanes:forward исправлено в соответствии с количеством поворотов"
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+" Количество lanes:both_ways исправлено в соответствии с количеством поворотов"
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+" Количество lanes:backward исправлено в соответствии с количеством поворотов"
+
+msgid "check the right direction of the way"
+msgstr "проверьте правильность направления дороги"
+
+msgid "Unidirectional road"
+msgstr "Одностороннее движение"
+
+msgid "Build unidirectional road"
+msgstr "Создать дорогу с односторонним движением"
+
+msgid "Bidirectional road"
+msgstr "Двустороннее движение"
+
+msgid "Build bidirectional road"
+msgstr "Создать дорогу с двусторонним движением"
+
+msgid "Use \"none\""
+msgstr "Использовать \"none\""
+
+msgid "use \"none\" instead of empty values"
+msgstr "использовать \"none\" вместо пустых значений"
+
+msgid "Preset turn lanes"
+msgstr "Заготовки полос"
+
+msgid "Recently turn lanes edits"
+msgstr "Недавние правки полос"
+
+msgid "Forward"
+msgstr "Вперёд"
+
+msgid "Both way lane"
+msgstr "Двусторонняя полоса"
+
+msgid "Backward"
+msgstr "Назад"
+
+msgid "Number of backward lanes"
+msgstr "Число полос lanes:backward"
+
+msgid "Number of forward lanes"
+msgstr "Число полос lanes:forward"
+
+msgid "Both way"
+msgstr "В обе стороны"
+
+msgid "Number of lanes"
+msgstr "Количество полос"
+
+msgid "Directional"
+msgstr "Направленность"
+
+msgid "Turn lanes"
+msgstr "Полосы для поворота"
+
 msgid "No such lane."
 msgstr "Нет такой полосы."
 
@@ -34223,7 +34522,7 @@ msgid "Add a way with role ''from''"
 msgstr "Добавить линию с ролью ''от''"
 
 msgid "Add a way with role ''to''"
-msgstr "Добавить линию с ролью ''куда''"
+msgstr "Добавить линию с ролью \"to\" (куда)"
 
 msgid ""
 "The two ways participating in the turn restriction <strong>aren''t "
@@ -34239,7 +34538,8 @@ msgstr ""
 "линии) к ограничению на поворот."
 
 msgid "Go to the Advanced Editor and add via objects"
-msgstr "Перейдите к Расширенному редактору и добавьте объекты \"через\""
+msgstr ""
+"Перейдите к Расширенному редактору и добавьте объекты \"via\" (через)"
 
 msgid ""
 "A turn restriction requires exactly one way with role <tt>from</tt>. This "
@@ -34646,9 +34946,6 @@ msgstr "Найти примитивы с этими тегами"
 msgid "Multitag Background: highlight"
 msgstr "Изменение тегов нескольких объектов: фон выделения"
 
-msgid "Replace Geometry"
-msgstr "Заменить геометрию"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Заменить геометрию выбранного объекта новой"
 
@@ -34863,15 +35160,9 @@ msgstr "начинает/приостанавливает воспроизвед
 msgid "Video: {0}"
 msgstr "Видео: {0}"
 
-msgid "Backward"
-msgstr "Назад"
-
 msgid "jumps n sec back"
 msgstr "отмотать n сек назад"
 
-msgid "Forward"
-msgstr "Вперёд"
-
 msgid "jumps n sec forward"
 msgstr "промотать n сек вперёд"
 
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index cf6056d..5072f41 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-09-04 21:08+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-06 21:55+0000\n"
 "Last-Translator: aceman444 <Unknown>\n"
 "Language-Team: Slovak <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:28+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:07+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: sk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -221,18 +221,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Pridať vrstvu mapového podkladu {0}"
 
-msgid "Error"
-msgstr "Chyba"
-
-msgid "Select image format for WMS layer"
-msgstr "Zvoľte formát obrázkov pre vrstvu WMS"
-
-msgid "Select WMS layers"
-msgstr "Vyberte WMS vrstvy"
-
-msgid "Add layers"
-msgstr "Pridať vrstvy"
-
 msgid "Invalid service URL."
 msgstr "Neplatná URL služba."
 
@@ -245,6 +233,18 @@ msgstr "Nepodarilo sa získať súbor WMS vrstvy."
 msgid "Could not parse WMS layer list."
 msgstr "Nemožno analyzovať súbor WMS vrstvy."
 
+msgid "Error"
+msgstr "Chyba"
+
+msgid "Select image format for WMS layer"
+msgstr "Zvoľte formát obrázkov pre vrstvu WMS"
+
+msgid "Select WMS layers"
+msgstr "Vyberte WMS vrstvy"
+
+msgid "Add layers"
+msgstr "Pridať vrstvy"
+
 msgid "Add Node..."
 msgstr "Pridať bod..."
 
@@ -3598,9 +3598,6 @@ msgstr "Identifikátor mriežky"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Dokument getCapabilities nedefinuje žiadne vrstvy: {0}"
 
-msgid "No layer selected"
-msgstr "Nebola zvolená žiadna vrstva"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4039,12 +4036,12 @@ msgstr "Viaceré relácie \"associatedStreet\""
 msgid "House number without street"
 msgstr "Číslo domu bez ulice"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Číslo domu ''{0}'' je duplicitné"
-
 msgid "Duplicate house numbers"
 msgstr "Duplicitné čísla domov"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Číslo domu ''{0}'' je duplicitné"
+
 msgid "Multiple street names in relation"
 msgstr "Viacnásobný počet názvu ulice v relácii"
 
@@ -4081,6 +4078,9 @@ msgstr "Pobrežie"
 msgid "This test checks that coastlines are correct."
 msgstr "Tento test kontroluje správnosť línií pobrežia."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Obrátené pobrežie: zem nie je na ľavej strane"
+
 msgid "Unconnected coastline"
 msgstr "Nespojené pobrežie"
 
@@ -4090,6 +4090,9 @@ msgstr "Neusporiadané pobrežie"
 msgid "Reversed coastline"
 msgstr "Obrátená pobrežná čiara"
 
+msgid "invalid coastline"
+msgstr "chybné pobrežie"
+
 msgid "Conditional Keys"
 msgstr "Podmienené kľúče"
 
@@ -4126,6 +4129,12 @@ msgstr "Križujúce sa hranice (boundary)"
 msgid "Crossing barriers"
 msgstr "Križujúce sa prekážky (barrier)"
 
+msgid "Self crossing"
+msgstr "Vlastné križovanie"
+
+msgid "Self-crossing ways"
+msgstr "Cesty križujúce sami seba"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4288,7 +4297,7 @@ msgid " or "
 msgstr " alebo "
 
 msgid "{0}, use {1} instead"
-msgstr "{0}, použite namiesto toho {1}"
+msgstr "{0}, použite namiesto toho \"{1}\""
 
 msgid "Adding {0} to tag checker"
 msgstr "Pridávam {0} do kontroly značiek"
@@ -4363,6 +4372,12 @@ msgstr "Žiadna platná funkcia pre člena multipolygónu"
 msgid "Non-Way in multipolygon"
 msgstr "V multipolygóne je člen, ktorý nie je cestou"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr "Člen multipolygónu sa opakuje s rôznymi rolami"
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr "Člen multipolygónu sa opakuje s rovnakou rolou"
+
 msgid "Missing name:* translation"
 msgstr "Chýbajúci preklad name:*"
 
@@ -4585,30 +4600,30 @@ msgstr "Hodnoty obsahujú viaceré medzery"
 msgid "Property values contain HTML entity"
 msgstr "Hodnotu obsahujú HTML entitu"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Kľúč \"{0}\" sa podobá na \"{1}\"."
-
 msgid "Misspelled property key"
 msgstr "Preklep v názve kľúča"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Kľúč ''{0}'' sa nenachádza v zozname predvolených hodnôt."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Kľúč \"{0}\" sa podobá na \"{1}\"."
 
 msgid "Presets do not contain property key"
 msgstr "Predvoľby neobsahujú kľúč"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Hodnota \"{0}\" pre kľúč \"{1}\" sa podobá na \"{2}\"."
+msgid "Key ''{0}'' not in presets."
+msgstr "Kľúč ''{0}'' sa nenachádza v zozname predvolených hodnôt."
 
 msgid "Misspelled property value"
 msgstr "Preklep v hodnote vlastnosti"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Hodnota ''{0}'' pre kľúč ''{1}'' nie je v predvolenom zozname."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Hodnota \"{0}\" pre kľúč \"{1}\" sa podobá na \"{2}\"."
 
 msgid "Presets do not contain property value"
 msgstr "Predvoľby neobsahujú hodnotu vlastnosti"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Hodnota ''{0}'' pre kľúč ''{1}'' nie je v predvolenom zozname."
+
 msgid "FIXMES"
 msgstr "FIXME"
 
@@ -4855,9 +4870,6 @@ msgstr "Nesprávne zoradené cesty"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Tento test kontroluje smer vodných, pozemných a pobrežných línií."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Obrátené pobrežie: zem nie je na ľavej strane"
-
 msgid "Reversed land: land not on left side"
 msgstr "Obrátená zem: zem nie je na ľavej strane"
 
@@ -5411,9 +5423,6 @@ msgstr "Zemepisná dĺžka na mieste kurzoru myši."
 msgid "System of measurement changed to {0}"
 msgstr "Systém merania sa zmenil na {0}"
 
-msgid "Layer not in list."
-msgstr "Vrstva nie je v zozname."
-
 msgid "Default (open, closed, new)"
 msgstr "Predvolené (otvorené, uzavreté, nové)"
 
@@ -6978,6 +6987,9 @@ msgstr "Zoradiť poznámky"
 msgid "Sort"
 msgstr "Triediť"
 
+msgid "Open the note in an external browser"
+msgstr "Otvoriť poznámku v externom prehliadači"
+
 msgid "Object type:"
 msgstr "Typ objektu:"
 
@@ -7229,6 +7241,15 @@ msgstr "Stiahnuť obsah zmenového súboru"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Stiahnuť obsah vybratých zmenových súborov zo servera"
 
+msgid "Download changed objects"
+msgstr "Stiahnuť zmenené objekty"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+"Stiahnuť aktuálnu verziu zmenených objektov zo vybraných sadách zmien"
+
 msgid "My changesets"
 msgstr "Moje zmenové súbory"
 
@@ -8628,9 +8649,6 @@ msgstr "Vložte názov miesta pre hľadanie"
 msgid "Areas around places"
 msgstr "Oblasť okolo miesta"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Chyba null pointera, možno sú neprítomné značky"
-
 msgid "Search ..."
 msgstr "Hľadať ..."
 
@@ -9269,6 +9287,9 @@ msgstr "Neuložené zmeny - Uložiť/Nahrať pred ukončením?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Neuložené zmeny - Uložiť/Nahrať pred zmazaním?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "Neuložené zmeny - Uložiť/Odoslať pred reštartovaním?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Nahrávam a ukladám zmenené vrstvy ..."
 
@@ -9347,6 +9368,12 @@ msgstr "Ukončiť ihneď!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Ukončiť JOSM bez uloženia. Neuložené zmeny budú stratené."
 
+msgid "Restart now!"
+msgstr "Reštartovať teraz!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr "Reštartovať JOSM bez uloženia. Neuložené zmeny budú stratené."
+
 msgid "Delete now!"
 msgstr "Zmazať teraz!"
 
@@ -9360,6 +9387,13 @@ msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 "Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené"
 
+msgid "Perform actions before restarting"
+msgstr "Vykonať akcie pred reštartovaním"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+"Reštartovať JOSM s uložením. Neuložené zmeny budú odoslané a/alebo uložené."
+
 msgid "Perform actions before deleting"
 msgstr "Vykonať akcie pred zmazaním"
 
@@ -11691,6 +11725,9 @@ msgstr "Kresliť šípky na jednosmerných cestách."
 msgid "Draw segment order numbers"
 msgstr "Vykresliť segmenty s poradovými číslami"
 
+msgid "Draw segment order numbers on selected way"
+msgstr "Zobraziť poradové čísla úsekov na zvolenej ceste"
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykresliť ohraničujúci rámec stiahnutých dát"
 
@@ -12987,7 +13024,7 @@ msgstr "OSM heslo:"
 
 msgid "Failed to retrieve OSM credentials from credential manager."
 msgstr ""
-"Nepodarilo sa získať prihlasovacie údaje pre OSM zo správcu prihlasovacích "
+"Nepodarilo sa získať prihlasovacie údaje do OSM zo správcu prihlasovacích "
 "údajov."
 
 msgid "Current credential manager is of type ''{0}''"
@@ -13993,6 +14030,9 @@ msgstr "NMEA import úspešný:"
 msgid "NMEA import failure!"
 msgstr "NMEA import zlyhal!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Chyba null pointera, možno sú neprítomné značky"
+
 msgid "Note Files"
 msgstr "Súbory poznámok"
 
@@ -14401,6 +14441,9 @@ msgstr "Nahrávam dáta ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Najdené neočakávané id 0 pre OSM základný objekt"
 
+msgid "Failed to evaluate {0}"
+msgstr "Nepodarilo sa vyhodnotiť {0}"
+
 msgid "Downloading data..."
 msgstr "Sťahujú sa dáta..."
 
@@ -16342,6 +16385,9 @@ msgstr "Tiris: DGM (Terénny model)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DGM (Povrchový model)"
 
+msgid "Tiris: contour lines"
+msgstr "Tiris: vrstevnice"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viedeň: Viacúčelová mapa (všeobecné použitie)"
 
@@ -16453,8 +16499,11 @@ msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Geodatastyrelsen DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr "SDFE Overflade Skyggekort (40 cm)"
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Geodatastyrelsen Skærmkort"
@@ -16634,6 +16683,9 @@ msgstr "Fotografie z bezpilotných lietadiel 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Snímky z dronov Canaan(Haiti) November 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr "Snímky z dronu Matthew (Haiti) Október 2016"
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ortofoto 2000"
 
@@ -16928,18 +16980,6 @@ msgstr "Freemap.sk Cyklomapa"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Lyžovanie"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovensko EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovensko EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovensko Historické mapy"
 
@@ -16949,6 +16989,9 @@ msgstr "RABA-KGZ: Slovinsko poľnohospodárska pôda"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Slovinsko zastavané plochy"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "Kapské mesto 2015 Letecké snímky"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Južná Afrika CD:NGI Letecké"
 
@@ -17081,6 +17124,9 @@ msgstr "Cesty Lesnej služby U.S.A."
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukrajina - Ortofotomapy 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Ukrajina - Kyjev 2014 (DZK)"
+
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
@@ -17475,6 +17521,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Stiahnutie OSM dát pozdĺž cesty"
 
+msgid "Dxf Import"
+msgstr "Dxf Import"
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17614,6 +17663,9 @@ msgstr ""
 "vytvorí graf kanálov a kontroluje podmnožinu kanálov či ide o križovatku "
 "alebo hľadá v podmnožine kanálov križovatky"
 
+msgid "Tools to help import Kartverket N50"
+msgstr "Nástroje na import Kartverket N50"
+
 msgid "Helps vectorizing WMS images."
 msgstr "Pomoc pri vektorizácii WMS obrázkov."
 
@@ -17860,6 +17912,13 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Vytvára radové domy mimo jednotlivých blokov."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+"Pridá zásobník práce (to do), ktorý zjednodušuje prácu s veľkým počtom "
+"objektov"
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17889,6 +17948,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin na digitálne podpísanie OSM dát"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr "Editor na pridávanie jazdných pruhov na cestách"
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr "GUI rozhranie pre pridávanie, úpravu a mazanie odbočovacích pruhov."
@@ -18055,6 +18117,10 @@ msgid "No wheeled vehicle"
 msgstr "Žiadne kolesové vozidlo"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr "jazdenie na koni"
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "ihrisko"
 
@@ -18800,7 +18866,7 @@ msgid "orthodox"
 msgstr "ortodoxná"
 
 msgid "pentecostal"
-msgstr "pentecostal"
+msgstr "letničné hnutie"
 
 msgid "presbyterian"
 msgstr "presbyteriánska"
@@ -19386,6 +19452,9 @@ msgstr "vo výstavbe"
 msgid "Ford"
 msgstr "Brod"
 
+msgid "stepping_stones"
+msgstr "rad kameňov pre chodcov"
+
 msgid "Ways"
 msgstr "Vedľajšie komunikácie"
 
@@ -21026,6 +21095,9 @@ msgstr "Pristávacia dráha"
 msgid "Taxiway"
 msgstr "Rolovacie dráhy"
 
+msgid "Holding Position"
+msgstr "Vyčkávacie miesto"
+
 msgid "Helipad"
 msgstr "Pristávacia plocha pre vrtuľníky"
 
@@ -21696,11 +21768,11 @@ msgstr "Číslo bodu"
 msgid "Point Name"
 msgstr "Meno bodu (miesta)"
 
-msgid "Phone Number"
-msgstr "Telefónne číslo"
+msgid "Emergency Phone Number"
+msgstr "Telefónne číslo záchrannej služby"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr "(Použite číslo ako je uvedené na tabuli.)"
 
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -21714,6 +21786,12 @@ msgstr "Stanovište sanitiek"
 msgid "Automated Defibrillator"
 msgstr "Automatický defibrilátor"
 
+msgid "Location description"
+msgstr "Popis umiestnenia"
+
+msgid "Phone Number"
+msgstr "Telefónne číslo"
+
 msgid "Located inside a building?"
 msgstr "Umiestnený vnútri budovy"
 
@@ -22583,6 +22661,10 @@ msgid "university"
 msgstr "univerzita"
 
 msgctxt "building"
+msgid "college"
+msgstr "vyššie vzdelávanie"
+
+msgctxt "building"
 msgid "hospital"
 msgstr "nemocnica"
 
@@ -22667,6 +22749,10 @@ msgid "public"
 msgstr "verejná"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "ruiny"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Počet podlaží"
 
@@ -22842,7 +22928,7 @@ msgid "Resource"
 msgstr "Nerastná surovina"
 
 msgid "aggregate"
-msgstr "agregát"
+msgstr "kamenivo"
 
 msgid "bauxite"
 msgstr "bauxit"
@@ -24878,8 +24964,14 @@ msgstr "Prírodná rezervácia"
 msgid "Scree"
 msgstr "Sutina"
 
-msgid "An accumulation of loose rocks."
-msgstr "Hromada voľných skál."
+msgid "An accumulation of loose angular rocks."
+msgstr "Nahromadenie voľných ostrých skál."
+
+msgid "Shingle"
+msgstr "Naplavenina"
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr "Nahromadenie voľných okruhliakov na pláži alebo v riečišti."
 
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -25056,7 +25148,7 @@ msgid "Garden"
 msgstr "Záhrada"
 
 msgid "Grass"
-msgstr "Tráva"
+msgstr "Trávnik"
 
 msgid "Village Green"
 msgstr "Obecná zeleň (centrálny park obce)"
@@ -25559,16 +25651,10 @@ msgstr "Trasy"
 msgid "Bicycle Route"
 msgstr "Cyklotrasa"
 
-msgid "icn"
-msgstr "medzinárodná"
-
-msgid "ncn"
+msgid "national"
 msgstr "národná"
 
-msgid "rcn"
-msgstr "regionálna"
-
-msgid "lcn"
+msgid "local"
 msgstr "miestna"
 
 msgid "Mountain Biking Route"
@@ -25577,18 +25663,6 @@ msgstr "Trasa pre horské bicykle"
 msgid "Hiking Route"
 msgstr "Turistiská trasa"
 
-msgid "iwn"
-msgstr "medzinárodná"
-
-msgid "nwn"
-msgstr "národná"
-
-msgid "rwn"
-msgstr "regionálna"
-
-msgid "lwn"
-msgstr "miestna"
-
 msgid "infrastructure"
 msgstr "infraštruktúra"
 
@@ -25601,18 +25675,6 @@ msgstr "Trasa pre chodcov"
 msgid "Riding Route"
 msgstr "Jazdecká trasa"
 
-msgid "ihn"
-msgstr "medzinárodná jazdecká trasa"
-
-msgid "nhn"
-msgstr "národná jazdecká trasa"
-
-msgid "rhn"
-msgstr "regionálna jazdecká trasa"
-
-msgid "lhn"
-msgstr "lokálna jazdecká trasa"
-
 msgid "Piste Route"
 msgstr "Zjazdovka"
 
@@ -25805,9 +25867,21 @@ msgstr "Nepárne čísla domov na párnej interpolácii adries."
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr "Cesta s {0}. Ak je to možné, označkujte každé číslo domu samostatne."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+"Objekt nemá {0}, avšak má {1} a {2}, ktorého hodnota vyzerá ako číslo domu."
+
+msgid "Same value of {0} and {1}"
+msgstr "Rovnaká hodnota {0} a {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} bez {1}"
 
+msgid "missing tag"
+msgstr "chýbajúca značka"
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} bez {1} alebo {2}"
 
@@ -25817,6 +25891,12 @@ msgstr "{0} bez {1}, {2} alebo {3}"
 msgid "{0} together with {1}"
 msgstr "{0} spolu s {1}"
 
+msgid "suspicious tag combination"
+msgstr "podozrivá kombinácia značiek"
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr "dva objekty, jeden s {0} a druhý s {1} + {2} + {3}"
+
 msgid "incomplete object: only {0}"
 msgstr "nekompletný objekt: iba {0}"
 
@@ -25832,39 +25912,24 @@ msgstr "{0} spolu s {1} a odporujúce si hodnoty"
 msgid "{0} on suspicious object"
 msgstr "{0} na podozrivom objekte"
 
-msgid "restaurant without name"
-msgstr "reštaurácia bez názvu (\"name\")"
-
-msgid "{0} used with {1}"
-msgstr "{0} použité s {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "značka \"natural=water\" použitá pre plavecký bazén"
 
 msgid "sport without physical feature"
 msgstr "šport bez fyzického objektu"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} by malo byť na bode kde sa pretínajú {1} a {2}"
-
 msgid "alternative name without {0}"
 msgstr "alternatívny názov bez {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "nekompletné použitie {0} na ceste bez {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Rovnaká hodnota {0} a {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Rovnaká hodnota {0}, {1} a {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} a {1} spolu s {2} a odporujúce si hodnoty"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Podozrivá kombinácia značiek: {0} a {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} na relácii bez {1}"
 
@@ -25889,9 +25954,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} spolu s {1} a {2}. Odstráňte {1} a {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Rozdielny počet jazdných pruhov v kľúčoch {0} a {1}"
+
+msgid "possibly missing {0} tag"
+msgstr "pravdepodobne chýbajúca značka {0}"
+
 msgid "{0} is deprecated"
 msgstr "{0} je zastaralý"
 
+msgid "deprecated tagging"
+msgstr "zastaralé značkovanie"
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr "\"{0}\" je bezobsažné, použite presnejšiu značku, napr. \"{1}\""
 
@@ -25918,8 +25992,8 @@ msgid ""
 "{0} is unspecific. Instead use the key fixme with the information what "
 "exactly should be fixed in the value of fixme."
 msgstr ""
-"{0} je málo presné. Použite namiesto toho kľúč fixme s informáciou čo presne "
-"má byť opravené."
+"\"{0}\" je málo presné. Použite namiesto toho kľúč fixme s informáciou čo "
+"presne má byť opravené."
 
 msgid "{0} is deprecated. Please use instead a multipolygon."
 msgstr "{0} je zastaralé. Prosím použite radšej multipolygón."
@@ -25958,11 +26032,17 @@ msgstr "Málo špecifická značka {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Definícia {0} je nejasná"
 
+msgid "{0} + {1} + {2}"
+msgstr "{0} + {1} + {2}"
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} sa neodporúča. Použite funkciu Otočiť smer ciest z menu Nástroje."
 
+msgid "{0}"
+msgstr "{0}"
+
 msgid "key with uncommon character"
 msgstr "kľúč s nezvyčajným znakom"
 
@@ -25973,13 +26053,13 @@ msgid "{0} is inaccurate"
 msgstr "{0} je nepresné"
 
 msgid "{0} is deprecated for {1}"
-msgstr "{0} je pre {1} zastaralé"
+msgstr "\"{0}\" je pre \"{1}\" zastaralé"
 
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
-msgstr "{0} je zastaralé. Použite namiesto toho predponu kľúča {1}: ."
+msgstr "\"{0}\" je zastaralé. Použite namiesto toho predponu kľúča {1}: ."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "podozrivý kľúč (končí na číslo): {0}"
+msgid "questionable key (ending with a number)"
+msgstr "podozrivý kľúč (končí číslom)"
 
 msgid "The key {0} has an uncommon value."
 msgstr "Kľúč {0} má nezvyčajnú hodnotu."
@@ -26023,8 +26103,8 @@ msgstr "Prekrývajúce sa rovnaké prírodné oblasti"
 msgid "Overlapping Identical Landuses"
 msgstr "Prekrývajúce sa rovnaké využitia oblasti"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} musí byť pripojené k ceste"
+msgid "isolated node which must be connected to a way"
+msgstr "osamotený bod, ktorý musí byť pripojený k ceste"
 
 msgid "node connects waterway and bridge"
 msgstr "bod spája vodnú cestu a most"
@@ -26059,6 +26139,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Pobrežie vovnútri \"{1}\""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} by malo byť na bode kde sa pretínajú {1} a {2}"
+
 msgid "abbreviated street name"
 msgstr "skrátený názov ulice"
 
@@ -26077,6 +26160,9 @@ msgstr "cesta bez označenia \"ref\""
 msgid "temporary highway type"
 msgstr "dočasný typ cesty"
 
+msgid "{0} used with {1}"
+msgstr "{0} použité s {1}"
+
 msgid "street name contains ss"
 msgstr "názov ulice obsahuje ss (Nemecko)"
 
@@ -26178,11 +26264,14 @@ msgstr "neznáma židovská \"denomination\""
 msgid "{0} is unnecessary"
 msgstr "{0} je nepotrebné"
 
+msgid "unnecessary tag"
+msgstr "nepotrebná značka"
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} je nepotrebné pre {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} nedáva zmysel"
+msgid "{0} makes no sense"
+msgstr "{0} nemá zmysel"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Body duplikujúce značky cesty, ktorej sú súčasťou"
@@ -26440,6 +26529,27 @@ msgstr "Nahrávam GPX stopu (track)"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Nahrať Stopy (Traces) na openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importujem..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr "DXF súbory [ImportDxf plugin] (*.dxf)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Prosím otvorte alebo vytvorte dátovú vrstvu pred importovaním"
+
+msgid "Import dxf"
+msgstr "Importovať dxf"
+
+msgid "Scale:"
+msgstr "Mierka:"
+
+msgid "unit(s) = "
+msgstr "jednotka(ky) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Zobraziť výškový profil"
 
@@ -26786,6 +26896,407 @@ 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 "Total images:"
+msgstr "Počet obrázkov:"
+
+msgid "images"
+msgstr "obrázky"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Vytvoriť vrstvu Mapillary"
+
+msgid "Start Mapillary layer"
+msgstr "Začať vrstvu 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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr "Importovať obrázky do postupnosti"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importovať obrázky do vrstvy Mapillary v postupnosti"
+
+msgid "Join mode"
+msgstr "Režim spájania"
+
+msgid "Join/unjoin pictures"
+msgstr "Spojiť/oddeliť obrázky"
+
+msgid "Join Mapillary pictures"
+msgstr "Spojiť obrázky Mapillary"
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr "Odoslať obrázky"
+
+msgid "Upload Mapillary pictures"
+msgstr "Odoslať obrázky Mapillary"
+
+msgid "Upload pictures."
+msgstr "Odoslať obrázky."
+
+msgid "Walk mode"
+msgstr "Režim chôdze"
+
+msgid "Start walk mode"
+msgstr "Spustiť 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 "View in website"
+msgstr "Zobraziť na webstránke"
+
+msgid "Copy key"
+msgstr "Kopírovať kľúč"
+
+msgid "Copy key tag"
+msgstr "Kopírovať značku"
+
+msgid "Edit on website"
+msgstr "Upraviť na webstránke"
+
+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 "Submit"
+msgstr ""
+
+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 folder"
+msgstr "Vybrať prečinok"
+
+msgid "Explore"
+msgstr "Preskúmať"
+
+msgid "Select a directory"
+msgstr "Vybrať priečinok"
+
+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 "Mapillary picture"
+msgstr "Obrázok Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Otvoriť okno Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Okno Mapillary"
+
+msgid "Open Mapillary main dialog"
+msgstr "Otvoriť hlavné 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 ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+msgstr ""
+
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr "len keď je požadované"
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 ""
+
+msgid "Supported image formats (JPG and PNG)"
+msgstr ""
+
+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 ""
+
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28502,9 +29013,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Login"
-msgstr ""
-
 msgid "Enable autologin"
 msgstr ""
 
@@ -28538,9 +29046,6 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Logout"
-msgstr ""
-
 msgid "Clear log"
 msgstr ""
 
@@ -29109,9 +29614,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -29281,21 +29783,9 @@ msgstr "Importované obrázky"
 msgid "Import vector graphics"
 msgstr "Importovať vektorovú grafiku"
 
-msgid "Scale:"
-msgstr "Mierka:"
-
-msgid "unit(s) = "
-msgstr "jednotka(ky) = "
-
-msgid "Importing..."
-msgstr "Importujem..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "SVG súbory [ImportVec plugin] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29500,6 +29990,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Nahradiť geometriu"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -29755,406 +30300,6 @@ msgstr ""
 msgid "Missing input data"
 msgstr "Chýbajú vstupné dáta"
 
-msgid "Mapillary Images"
-msgstr "Obrázky z Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Vrstva Mapillary"
-
-msgid "Total images:"
-msgstr "Počet obrázkov:"
-
-msgid "images"
-msgstr "obrázky"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Vytvoriť vrstvu Mapillary"
-
-msgid "Start Mapillary layer"
-msgstr "Začať vrstvu 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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr "Importovať obrázky do postupnosti"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importovať obrázky do vrstvy Mapillary v postupnosti"
-
-msgid "Join mode"
-msgstr "Režim spájania"
-
-msgid "Join/unjoin pictures"
-msgstr "Spojiť/oddeliť obrázky"
-
-msgid "Join Mapillary pictures"
-msgstr "Spojiť obrázky Mapillary"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr "Odoslať obrázky"
-
-msgid "Upload Mapillary pictures"
-msgstr "Odoslať obrázky Mapillary"
-
-msgid "Upload pictures."
-msgstr "Odoslať obrázky."
-
-msgid "Walk mode"
-msgstr "Režim chôdze"
-
-msgid "Start walk mode"
-msgstr "Spustiť 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 "Uploaded {0} images"
-msgstr "Odoslalo sa {0} obrázkov"
-
-msgid "Approve upload on the website"
-msgstr "Potvrdiť odoslanie na webstránke"
-
-msgid "View in website"
-msgstr "Zobraziť na webstránke"
-
-msgid "Copy key"
-msgstr "Kopírovať kľúč"
-
-msgid "Copy key tag"
-msgstr "Kopírovať značku"
-
-msgid "Edit on website"
-msgstr "Upraviť na webstránke"
-
-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 "Submit"
-msgstr ""
-
-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 folder"
-msgstr "Vybrať prečinok"
-
-msgid "Explore"
-msgstr "Preskúmať"
-
-msgid "Select a directory"
-msgstr "Vybrať priečinok"
-
-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 "Mapillary picture"
-msgstr "Obrázok Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Otvoriť okno Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Okno Mapillary"
-
-msgid "Open Mapillary main dialog"
-msgstr "Otvoriť hlavné 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 ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr "len keď je požadované"
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"Stiahnutá oblasť OSM je príliš veľká. Režim sťahovania bol zmenený na "
-"poloautomatický, kým nezačnete vrstvu znovu."
-
-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 ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Namerané hodnoty"
 
@@ -31626,6 +31771,9 @@ msgstr "PT: Cesta je vo výstavbe"
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr "PT: Trasa prechádza jednosmernou cestou nesprávnym smerom"
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "koľajnica (rail)"
 
@@ -31721,9 +31869,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -32752,6 +32897,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Rad (Terrace)"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -33200,6 +33405,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Vpred"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Späť"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -34140,9 +34423,6 @@ msgstr "Nájsť základné objekty s týmito značkami"
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Nahradiť geometriu"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Nahradiť geometriu vybraného objektu novou"
 
@@ -34353,15 +34633,9 @@ msgstr "spustí/pozastaví prehrávanie videa"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "Späť"
-
 msgid "jumps n sec back"
 msgstr "skočí n sekúnd späť"
 
-msgid "Forward"
-msgstr "Vpred"
-
 msgid "jumps n sec forward"
 msgstr "skočí n sekúnd dopredu"
 
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 5377ed5..9388f04 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:29+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:07+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: sl\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -205,28 +205,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Dodaj plast zračnih posnetkov {0}"
 
-msgid "Error"
-msgstr "Napaka"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Napaka"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3294,9 +3294,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3706,10 +3703,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3746,6 +3743,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3755,6 +3755,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3791,6 +3794,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4009,6 +4018,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4219,30 +4234,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4486,9 +4501,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5015,9 +5027,6 @@ msgstr "Geografska dolžina pod kazalcem miške."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "Plasti ni na seznamu."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6437,6 +6446,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Tip objekta:"
 
@@ -6676,6 +6688,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7956,9 +7976,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8530,6 +8547,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8581,6 +8601,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8593,6 +8619,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10650,6 +10682,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Riši meje sprejetega področja"
 
@@ -12739,6 +12774,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13103,6 +13141,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14750,6 +14791,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14861,7 +14905,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15040,6 +15087,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15334,18 +15384,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15355,6 +15393,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15487,6 +15528,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15854,6 +15898,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15968,6 +16015,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16165,6 +16215,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16187,6 +16242,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16343,6 +16401,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17663,6 +17725,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Poti"
 
@@ -19282,6 +19347,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19952,10 +20020,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19970,6 +20038,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20839,6 +20913,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20923,6 +21001,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23128,7 +23210,13 @@ msgstr "Naravni rezervat"
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23795,16 +23883,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23813,18 +23895,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23837,18 +23907,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24041,9 +24099,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24053,6 +24122,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24068,39 +24143,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24119,9 +24179,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24176,10 +24245,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24195,7 +24270,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24240,7 +24315,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24274,6 +24349,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24292,6 +24370,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24382,10 +24463,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24631,6 +24715,27 @@ msgstr "Pošiljanje sledi GPX"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Pošlji sledi na openstreetmap.org"
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24969,3269 +25074,3306 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Alphabetic address must end with a letter"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Add address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Next no"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Length preserved"
 msgstr ""
 
-msgid "Select commune"
+msgid "Angle preserved"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Change the current projection"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "off"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "high"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "address"
+msgid "What''s new..."
 msgstr ""
 
-msgid "locality"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "section"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "commune"
+msgid "Errr..."
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Browser not supported."
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Building address"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "skip"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "House number:"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Street:"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Post code:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Building:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Tags:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Name:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "updated building info"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Created area"
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Parcels."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Angle Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "show address dialog"
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "merge nodes"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Debug"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
 msgstr ""
 
 msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Alert Message"
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Street Name:"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Advanced settings"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Create building"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Length step:"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "Set width of the building"
+msgstr ""
+
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
-msgstr "Prazna plast"
+msgid "medium"
+msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Layers:"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Conflate"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder method"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Layer:"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "Subject"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Incomplete selections"
+msgid "Create buildings"
 msgstr ""
 
-msgid "Restore subject selection"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Create boundary"
+msgstr ""
+
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Requires restart"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
-msgid "Max download boxes"
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "(optional)"
 msgstr ""
 
-msgid "Extra download area"
+msgid "Change location"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "Max download area"
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Commune"
 msgstr ""
 
-msgid "Download strategy"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+msgid "Departement"
 msgstr ""
 
-msgid "Split area"
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "Add new layer"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Save image as..."
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download along..."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Download Along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid "Image cropping"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "EditGpx"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "East"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "External tool error"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
 msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "Edit tool"
-msgstr ""
+msgid "Blank Layer"
+msgstr "Prazna plast"
 
-msgid "CmdLine:"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "External tools"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "Are you sure?"
-msgstr "Ali ste prepričani?"
-
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
-msgstr "izbriši podatke po uvozu"
-
-msgid "Importing data from device."
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "Layer:"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Subject"
 msgstr ""
 
-msgid "No data found on device."
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "Connection failed."
-msgstr "Povezava ni uspela."
+msgid "Incomplete selections"
+msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore subject selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr "Uvozi podatke iz Globalsat Datalogger DG100 naprave v plast GPX."
+msgid "Freeze subject selection"
+msgstr ""
 
-msgid "Import"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Empty selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "GPX Data"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element without name"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "Max download area"
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Split area"
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "height (m)"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "width (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "length (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Access class"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access types"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Road requirements"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "External tools"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "Are you sure?"
+msgstr "Ali ste prepričani?"
+
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
 msgstr ""
 
-msgid "Coloring:"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Graphview"
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Ruleset"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Private chat"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Close tab"
 msgstr ""
 
-msgid "Select directory"
+msgid "Clear log"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Visualization"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Node color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrow color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "New bookmark"
+msgid "A By Time"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Distance"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "B By Time"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "refresh the port list"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "delete data after import"
+msgstr "izbriši podatke po uvozu"
+
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Error deleting data."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "Connection failed."
+msgstr "Povezava ni uspela."
+
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+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 "edit bounds for selected defaults"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "GPSBlam"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPX Data"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Change Color"
+msgid "Class element without name"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "mm"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "cm"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "m"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid "km"
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "Offset Information"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "No ruleset"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Imagery ID"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Determined right here"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Reason"
+msgid "height (m)"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "width (m)"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "length (m)"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "axleload (t)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "Bookmark name"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "Access class"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Access types"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Road requirements"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Normal"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate 270"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Previous image"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Next image"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Rotate left"
+msgid "default"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "end nodes"
 msgstr ""
 
-msgid "Rotate right"
+msgid "incline"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "Parameters:"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "Coloring:"
 msgstr ""
 
-msgid "Imported Images"
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Graphview"
 msgstr ""
 
-msgid "Scale:"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Ruleset"
 msgstr ""
 
-msgid "Importing..."
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Select directory"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Vehicle"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Visualization"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Node color"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Arrow color"
 msgstr ""
 
-msgid "POWER"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "Working Level"
+msgid "New bookmark"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Level Name"
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Choose node color"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "Fitting"
+msgid "Routing graph calculated by the GraphView plugin"
 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>"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "Level Selection"
+msgid "graphview default node"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "Highest Level"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "The highest level of your building."
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "InfoMode"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "GPX info mode"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Delete this"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "Delete this&older"
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "km/h"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Track name: "
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "edit bounds for selected defaults"
+msgstr ""
+
+msgid "Download imagery XML bounds"
 msgstr ""
 
 msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid "Change Color"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "JunctionChecking"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "junctions"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Offset"
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid "mm"
 msgstr ""
 
-msgid "Check "
+msgid "cm"
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "km"
 msgstr ""
 
-msgid "Search "
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Deprecated offsets"
 msgstr ""
 
 msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Offset Information"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid "Report this offset"
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "Determined right here"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Tracing"
+msgid "Reason"
 msgstr ""
 
-msgid "checking cache..."
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "east"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "northeast"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "north"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "west"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "southwest"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "south"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "southeast"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "coastline"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "land"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Normal"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr "Ločljivost ploščic Landsat (pikslov na stopinjo)"
-
-msgid "Size of Landsat tiles (pixels)"
-msgstr "Velikost ploščic Landsat (pikslov)"
-
-msgid "Shift all traces to east (degrees)"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Previous image"
 msgstr ""
 
-msgid "WMS Layer"
-msgstr "Plast WMS"
+msgid "Next image"
+msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate left"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Rotate image left"
 msgstr ""
 
-msgid "Source text"
+msgid "Rotate right"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate image right"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Imported Images"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Concourse wizard ..."
 msgstr ""
-"Ločljivost ploščic Landsat, merjena v pikslih na stopinjo. Privzeto 4000."
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "POWER"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Working Level"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Level Name"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connection Failed"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "Not connected"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Connecting"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Connected"
+msgid "Apply Tags"
 msgstr ""
 
-msgid "no name"
+msgid "Fitting"
 msgstr ""
 
-msgid "Live GPS"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Show GPS data."
-msgstr "Prikaži GPS podatke."
-
-msgid "Status"
-msgstr "Stanje"
+msgid "Level Selection"
+msgstr ""
 
-msgid "Way Info"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "Speed"
-msgstr "Hitrost"
+msgid "The lowest level of your building."
+msgstr ""
 
-msgid "Course"
+msgid "Highest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
-msgstr "Zajemi GPS sled"
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "InfoMode"
 msgstr ""
-"Povezava s strežnikom gpsd in prikaz trenutnega položaja na plasti LiveGPS."
 
-msgid "Center Once"
-msgstr "Centriraj zdaj"
+msgid "GPX info mode"
+msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
-msgstr "Centiraj plast LiveGPS na trenuten položaj."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
 
-msgid "Auto-Center"
-msgstr "Samodejno centriraj"
+msgid "Delete this"
+msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
-msgstr "Nenehno centriraj plast LiveGPS na trenutni položaj."
+msgid "Delete this&older"
+msgstr ""
 
-msgid "Open MapDust"
+msgid "km/h"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Track name: "
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Missing input data"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Total images:"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "images"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Mapillary"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export pictures"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Export images"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Import local pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Select pictures"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join mode"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "Check "
 msgstr ""
 
-msgid "Submit changeset"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Search "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Upload pictures."
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Walk mode"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Correct"
 msgstr ""
 
-msgid "View in website"
+msgid "Wrong"
 msgstr ""
 
-msgid "Copy key"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Submit"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export all images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Replace way"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Explore"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Select a directory"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "Speed limit"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Give way"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "No entry"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "Uneven road"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "No parking"
+msgid "Tracing"
 msgstr ""
 
-msgid "No overtaking"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "No turn"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Years"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Months"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Days"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Imported images"
+msgid "east"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "northeast"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "north"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northwest"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "west"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "southwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Next picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr "Ločljivost ploščic Landsat (pikslov na stopinjo)"
+
+msgid "Size of Landsat tiles (pixels)"
+msgstr "Velikost ploščic Landsat (pikslov)"
+
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
+msgid "WMS Layer"
+msgstr "Plast WMS"
 
-msgid "Jump to blue"
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Play"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Pause"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Pauses the walk."
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
+"Ločljivost ploščic Landsat, merjena v pikslih na stopinjo. Privzeto 4000."
 
-msgid "Preview images when hovering its icon"
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Download mode"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Go forward"
+msgid "Downloading image tile..."
 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"
+msgid "Could not acquire image"
 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"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
-msgstr ""
+msgid "Show GPS data."
+msgstr "Prikaži GPS podatke."
 
-msgid "Mapillary login"
-msgstr ""
+msgid "Status"
+msgstr "Stanje"
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
+msgid "Speed"
+msgstr "Hitrost"
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
-msgstr ""
+msgid "Capture GPS Track"
+msgstr "Zajemi GPS sled"
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
+"Povezava s strežnikom gpsd in prikaz trenutnega položaja na plasti LiveGPS."
 
-msgid "Finished upload"
-msgstr ""
+msgid "Center Once"
+msgstr "Centriraj zdaj"
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
+msgid "Center the LiveGPS layer to current position."
+msgstr "Centiraj plast LiveGPS na trenuten položaj."
 
-msgid "Not Logged in to Mapillary"
-msgstr ""
+msgid "Auto-Center"
+msgstr "Samodejno centriraj"
 
-msgid "Uploading: {0}"
-msgstr ""
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr "Nenehno centriraj plast LiveGPS na trenutni položaj."
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29693,6 +29835,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29788,9 +29933,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30802,6 +30944,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31249,6 +31451,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Naprej"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32077,9 +32357,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32273,15 +32550,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "Naprej"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index 526f0c5..c743a8d 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 04:32+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 04:31+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "Gabim"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Gabim"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index b7e93b8..dd25d09 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:26+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:05+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: sr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -205,28 +205,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Додај слој за слике {0}"
 
-msgid "Error"
-msgstr "Грешка"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "Грешка"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3279,9 +3279,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3683,10 +3680,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3723,6 +3720,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3732,6 +3732,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3768,6 +3771,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3986,6 +3995,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4196,30 +4211,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4463,9 +4478,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4986,9 +4998,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6408,6 +6417,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6647,6 +6659,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7919,9 +7939,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8486,6 +8503,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8537,6 +8557,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8549,6 +8575,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10602,6 +10634,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12683,6 +12718,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13045,6 +13083,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14688,6 +14729,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14799,7 +14843,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14978,6 +15025,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15272,18 +15322,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15293,6 +15331,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15425,6 +15466,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15792,6 +15836,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15906,6 +15953,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16103,6 +16153,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16125,6 +16180,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16281,6 +16339,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17601,6 +17663,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19220,6 +19285,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19890,10 +19958,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19908,6 +19976,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20777,6 +20851,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20861,6 +20939,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23066,7 +23148,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23733,16 +23821,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23751,18 +23833,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23775,18 +23845,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23979,9 +24037,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23991,6 +24060,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24006,39 +24081,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24057,9 +24117,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24114,10 +24183,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24133,7 +24208,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24178,7 +24253,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24212,6 +24287,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24230,6 +24308,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24320,10 +24401,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24569,6 +24653,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24907,3267 +25012,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29629,6 +29771,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29724,9 +29869,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30738,6 +30880,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31185,6 +31387,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32011,9 +32291,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32207,15 +32484,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index 09f7246..5e970b6 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-09-05 09:33+0000\n"
-"Last-Translator: Tomas Marklund <tomasmarklund75 at gmail.com>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-10-08 14:18+0000\n"
+"Last-Translator: Niklas Henriksson <fringillus92 at gmail.com>\n"
 "Language-Team: Swedish <sv at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:31+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:09+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: sv\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -211,18 +211,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Lägg till bildlager {0}"
 
-msgid "Error"
-msgstr "Fel"
-
-msgid "Select image format for WMS layer"
-msgstr "Välj bildformat för WMS-lager"
-
-msgid "Select WMS layers"
-msgstr "Välj WMS-lager"
-
-msgid "Add layers"
-msgstr "Lägg till lager"
-
 msgid "Invalid service URL."
 msgstr "Ogiltig URL"
 
@@ -235,6 +223,18 @@ msgstr "Kunde inte hämta lista över WMS-lager"
 msgid "Could not parse WMS layer list."
 msgstr "Kunde inte tolka lista över WMS-lager."
 
+msgid "Error"
+msgstr "Fel"
+
+msgid "Select image format for WMS layer"
+msgstr "Välj bildformat för WMS-lager"
+
+msgid "Select WMS layers"
+msgstr "Välj WMS-lager"
+
+msgid "Add layers"
+msgstr "Lägg till lager"
+
 msgid "Add Node..."
 msgstr "Lägg till nod..."
 
@@ -487,10 +487,10 @@ msgid "Download notes in current view"
 msgstr "Ladda ner kartanteckningar i nuvarande vy."
 
 msgid "Download in current view"
-msgstr ""
+msgstr "Ladda ner nuvarande område"
 
 msgid "Download map data from the OSM server in current view"
-msgstr ""
+msgstr "Ladda ner kartdata från OSM-servern för nuvarande område"
 
 msgid "Download object..."
 msgstr "Ladda ner objekt..."
@@ -508,7 +508,7 @@ msgid "Duplicate"
 msgstr "Duplicera"
 
 msgid "Duplicate selection."
-msgstr ""
+msgstr "Duplicera val"
 
 msgid "Exit"
 msgstr "Avsluta"
@@ -1124,10 +1124,10 @@ msgid "Paste"
 msgstr "Klistra in"
 
 msgid "Paste contents of clipboard."
-msgstr ""
+msgstr "Klistra in innehållet från \"urklipp\"."
 
 msgid "Paste at source position"
-msgstr ""
+msgstr "Klistra in på källans position"
 
 msgid "Paste contents of clipboard at the position they were copied from."
 msgstr ""
@@ -3003,7 +3003,7 @@ msgid "Change relation {0}"
 msgstr "Ändra relation {0}"
 
 msgid "Change nodes of {0}"
-msgstr ""
+msgstr "Ändra noder för {0}"
 
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Radera \"{0}\" för nod \"{1}\""
@@ -3540,9 +3540,6 @@ msgstr "Matrix-lägesindentifierare"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Lager definierade av getCapabilities document: {0}"
 
-msgid "No layer selected"
-msgstr "Inget lager valt"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3762,7 +3759,7 @@ msgid "Expected integer value in range 1-60 for ''+zone=...'' parameter."
 msgstr ""
 
 msgid "No unit found for: {0}"
-msgstr ""
+msgstr "Ingen enhet hittad för: {0}"
 
 msgid "Unknown parameter: ''{0}''."
 msgstr "Okänd parameter: ''{0}''."
@@ -3953,12 +3950,12 @@ msgstr "Flera associatedStreet-relationer"
 msgid "House number without street"
 msgstr "Husnummer utan gata"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Husnummer \"{0}\" duplicerat"
-
 msgid "Duplicate house numbers"
 msgstr "Duplicera husnummer"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Husnummer \"{0}\" duplicerat"
+
 msgid "Multiple street names in relation"
 msgstr "Multipla gatunamn i relation"
 
@@ -3986,7 +3983,7 @@ msgid "Checks for errors in barriers and entrances."
 msgstr "Kontrollera fel i barriärer och ingångar"
 
 msgid "Barrier entrance not set on a barrier"
-msgstr ""
+msgstr "Öppning i hinder är inte satt på ett hinder"
 
 msgid "Coastlines"
 msgstr "Kustlinjer"
@@ -3994,6 +3991,9 @@ msgstr "Kustlinjer"
 msgid "This test checks that coastlines are correct."
 msgstr "Detta test kontrollerar om kustlinjerna är korrekta."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Felvänd kustlinje (coastline): land inte på vänster sida"
+
 msgid "Unconnected coastline"
 msgstr "Oansluten kustlinje"
 
@@ -4003,6 +4003,9 @@ msgstr "Oordnad kustlinje"
 msgid "Reversed coastline"
 msgstr "Omvänd kustlinje"
 
+msgid "invalid coastline"
+msgstr "ogiltig kustlinje"
+
 msgid "Conditional Keys"
 msgstr "Villkorliga nycklar"
 
@@ -4039,6 +4042,12 @@ msgstr "Korsande gränser"
 msgid "Crossing barriers"
 msgstr "Korsande hinder"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4144,7 +4153,7 @@ msgid "Unknown source:maxspeed context: {0}"
 msgstr ""
 
 msgid "Internet tags"
-msgstr ""
+msgstr "Internet-taggar"
 
 msgid "Checks for errors in internet-related tags."
 msgstr ""
@@ -4230,7 +4239,11 @@ msgid ""
 msgid_plural ""
 "Multipolygon relation should be tagged with area tags and not the outer ways"
 msgstr[0] ""
+"Multipolygon-relationen ska vara taggad med area-taggar och inte den yttre "
+"sträckan."
 msgstr[1] ""
+"Multipolygon-relationerna ska vara taggade med area-taggar och inte de yttre "
+"sträckorna."
 
 msgid ""
 "With the currently used mappaint style the style for inner way equals the "
@@ -4258,11 +4271,17 @@ msgid "Intersection between multipolygon ways"
 msgstr ""
 
 msgid "No useful role for multipolygon member"
-msgstr ""
+msgstr "Ingen användbar roll för multipolygonens medlem"
 
 msgid "Non-Way in multipolygon"
 msgstr "Multipolygon innehåller annat än sträckor"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4357,13 +4376,13 @@ msgid "Public Transport Route"
 msgstr "Kollektivtrafiksrutt"
 
 msgid "Route relation contains a ''{0}'' role"
-msgstr ""
+msgstr "Rutt-relationen innehåller en roll \"{0}\""
 
 msgid "Route relation contains a gap"
-msgstr ""
+msgstr "Rutt-relationen innehåller ett glapp"
 
 msgid "Stop position not part of route"
-msgstr ""
+msgstr "Stopp-positionen är inte medlem av rutten"
 
 msgid "Role verification problem"
 msgstr "Rollverifieringsproblem"
@@ -4482,31 +4501,31 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Det finns en HTML-markör i egenskapsvärdet"
 
+msgid "Misspelled property key"
+msgstr ""
+
 msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
-msgid "Misspelled property key"
+msgid "Presets do not contain property key"
 msgstr ""
 
 msgid "Key ''{0}'' not in presets."
 msgstr "Nyckeln ''{0}'' finns Ej bland förinställda mallar."
 
-msgid "Presets do not contain property key"
+msgid "Misspelled property value"
 msgstr ""
 
 msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
-msgid "Misspelled property value"
+msgid "Presets do not contain property value"
 msgstr ""
 
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 "Värdet ''{0}'' för nyckeln ''{1}'' finns Ej bland förinställda mallar."
 
-msgid "Presets do not contain property value"
-msgstr ""
-
 msgid "FIXMES"
 msgstr "FIXME-taggar"
 
@@ -4592,19 +4611,19 @@ msgid "No \"to\" way found"
 msgstr "Ingen sträcka med rollen \"till\" (to) hittades"
 
 msgid "\"from\" way equals \"to\" way"
-msgstr ""
+msgstr "\"från\"-sträckan är samma som \"till\"-sträckan"
 
 msgid "No \"via\" node or way found"
 msgstr "Ingen sträcka eller nod med rollen \"via\" hittades"
 
 msgid "The \"from\" way does not start or end at a \"via\" node."
-msgstr ""
+msgstr "\"från\"-sträckan startar eller slutar inte med en \"via\"-nod"
 
 msgid "Superfluous turnrestriction as \"to\" way is oneway"
 msgstr ""
 
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr ""
+msgstr "\"till\"-sträckan startar eller slutar inte med en \"via\"-nod"
 
 msgid "The \"from\" and the first \"via\" way are not connected."
 msgstr ""
@@ -4658,13 +4677,13 @@ msgid "area"
 msgstr "yta"
 
 msgid "Unconnected highways"
-msgstr ""
+msgstr "Ej anslutna vägare"
 
 msgid "Unconnected railways"
-msgstr ""
+msgstr "Ej anslutna järnvägar"
 
 msgid "Unconnected waterways"
-msgstr ""
+msgstr "Ej anslutna vattendrag"
 
 msgid "Unconnected natural lands and landuses"
 msgstr ""
@@ -4761,9 +4780,6 @@ msgstr ""
 "Detta test kontrollerar riktningen på sträckor av typerna vatten (water), "
 "land (land) och kustlinje (coastline)."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Felvänd kustlinje (coastline): land inte på vänster sida"
-
 msgid "Reversed land: land not on left side"
 msgstr "Felriktat land: land inte på vänster sida"
 
@@ -5171,7 +5187,7 @@ msgid "Menu: {0}"
 msgstr "Meny: {0}"
 
 msgid "Main toolbar"
-msgstr ""
+msgstr "Huvudverktygsrad"
 
 msgid ""
 "Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
@@ -5246,13 +5262,13 @@ msgid "Status bar background"
 msgstr "Statusbarbakgrund"
 
 msgid "Status bar background: active"
-msgstr ""
+msgstr "Statusrad bakgrund: aktiv"
 
 msgid "Status bar foreground"
-msgstr ""
+msgstr "Statusrad förgrund"
 
 msgid "Status bar foreground: active"
-msgstr ""
+msgstr "Statusrad förgrund: aktiv"
 
 msgid "{0} ({1})"
 msgstr "{0} ({1})"
@@ -5281,7 +5297,7 @@ msgid "User:"
 msgstr "Användare:"
 
 msgid "Do not hide status bar"
-msgstr ""
+msgstr "Göm inte statusraden"
 
 msgid "The northing at the mouse pointer."
 msgstr ""
@@ -5298,9 +5314,6 @@ msgstr "Den geografiska longituden vid muspekaren."
 msgid "System of measurement changed to {0}"
 msgstr "Måttsystem ändrat till {0}"
 
-msgid "Layer not in list."
-msgstr "lagret finns inte i listan."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -5308,10 +5321,10 @@ msgid "Username"
 msgstr "Användarnamn"
 
 msgid "Created date"
-msgstr ""
+msgstr "Skapad datum"
 
 msgid "Last change date"
-msgstr ""
+msgstr "Senast ändrad datum"
 
 msgid "Select note sorting method"
 msgstr ""
@@ -5834,7 +5847,7 @@ msgid "Apply resolved conflicts"
 msgstr ""
 
 msgid "Apply"
-msgstr ""
+msgstr "Verkställ"
 
 msgid ""
 "You are about to combine {1} object, which is part of {0} "
@@ -5871,7 +5884,7 @@ msgid "<i>missing</i>"
 msgstr "<i>saknas</i>"
 
 msgid ", "
-msgstr ""
+msgstr ", "
 
 msgid "Choose a value"
 msgstr "Välj ett värde"
@@ -6193,7 +6206,7 @@ msgid "Click to close this dialog and continue editing"
 msgstr ""
 
 msgid "Conflicts detected"
-msgstr ""
+msgstr "Konflikter upptäckta"
 
 msgid "Resolve conflicts"
 msgstr "Lös konflikter"
@@ -6279,7 +6292,7 @@ msgid "Hiding filter"
 msgstr "Döljer filter"
 
 msgid "Inverse filter"
-msgstr ""
+msgstr "Invertera filter"
 
 msgid "Filter mode"
 msgstr ""
@@ -6379,7 +6392,7 @@ msgid "deleted-on-server"
 msgstr ""
 
 msgid "modified"
-msgstr ""
+msgstr "ändrad"
 
 msgid "filtered/hidden"
 msgstr ""
@@ -6394,7 +6407,7 @@ msgid "has direction keys"
 msgstr ""
 
 msgid "State: "
-msgstr ""
+msgstr "Status: "
 
 msgid "Data Set: "
 msgstr ""
@@ -6526,28 +6539,34 @@ msgid ""
 msgstr ""
 
 msgid "Coordinate value can be in one of three formats:"
-msgstr ""
+msgstr "Koordinatvärdet kan vara i ett av tre följande format:"
 
 msgid "<i>degrees</i><tt>°</tt>"
-msgstr ""
+msgstr "<i>grader</i><tt>°</tt>"
 
 msgid "<i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt>"
-msgstr ""
+msgstr "<i>grader</i><tt>°</tt> <i>minuter</i><tt>°</tt>"
 
 msgid ""
 "<i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt> "
 "<i>seconds</i><tt>&quot</tt>"
 msgstr ""
+"<i>grader</i><tt>°</tt> <i>minuter</i><tt>°</tt> "
+"<i>sekunder</i><tt>&quot</tt>"
 
 msgid ""
 "Symbols <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
 "<tt>″</tt> are optional."
 msgstr ""
+"Tecknen <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
+"<tt>″</tt> är valfria."
 
 msgid ""
 "You can also use the syntax <tt>lat=\"...\" lon=\"...\"</tt> or "
 "<tt>lat=''...'' lon=''...''</tt>."
 msgstr ""
+"Du kan även använda syntaxen <tt>lat=\"...\" lon=\"...\"</tt> or "
+"<tt>lat=''...'' lon=''...''</tt>."
 
 msgid "Some examples:"
 msgstr "Några exampel:"
@@ -6703,7 +6722,7 @@ msgid "List of notes"
 msgstr "Anteckningslista"
 
 msgid "Add comment"
-msgstr ""
+msgstr "Lägg till kommentar"
 
 msgid "Comment"
 msgstr "Kommentar"
@@ -6741,6 +6760,9 @@ msgstr "Sortera anteckningar"
 msgid "Sort"
 msgstr "Sortera"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Objekttyp"
 
@@ -6852,7 +6874,7 @@ msgid "Click to minimize/maximize the panel content"
 msgstr "Klicka för att minimera/maximera panelens innehåll"
 
 msgid "Side buttons"
-msgstr ""
+msgstr "Sidoknappar"
 
 msgid "Authors"
 msgstr "Upphovsmän"
@@ -6945,7 +6967,7 @@ msgstr ""
 "Visa de objekt som skapas, uppdateras eller tas bort av ändringsuppsättningen"
 
 msgid "Discussion"
-msgstr ""
+msgstr "Diskussion"
 
 msgid "Display the public discussion around this changeset"
 msgstr ""
@@ -6957,7 +6979,7 @@ msgid "Close the dialog"
 msgstr "Stäng dialogfönstret"
 
 msgid "Query"
-msgstr ""
+msgstr "Fråga"
 
 msgid "Launch the dialog for querying changesets"
 msgstr "Öppna dialogen för att söka i ändringsuppsättningar"
@@ -6984,6 +7006,14 @@ msgstr "Hämta hem innehållet i ändringsuppsättningar"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Hämta hem innehållet i valda ämnesuppsättningar från servern."
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Mina ändringsuppsättningar"
 
@@ -7014,7 +7044,7 @@ msgid "ID"
 msgstr "ID"
 
 msgid "Open"
-msgstr ""
+msgstr "Öppna"
 
 msgid "User"
 msgstr "Användare"
@@ -7137,10 +7167,10 @@ msgid "{0} [incomplete]"
 msgstr ""
 
 msgid "open"
-msgstr ""
+msgstr "öppna"
 
 msgid "closed"
-msgstr ""
+msgstr "stängt"
 
 msgid "Download content"
 msgstr "Hämta innehåll"
@@ -7279,7 +7309,7 @@ msgstr ""
 
 msgid ""
 "The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
+msgstr "Angett värde är inte ett giltigt användar-ID. Ange ett heltal > 0"
 
 msgid "Please enter an integer value > 0"
 msgstr "Ange ett heltal > 0"
@@ -7414,10 +7444,10 @@ msgid "Copy {1} of {0}"
 msgstr "Kopia {1} av {0}"
 
 msgid "Change visibility of the selected layer."
-msgstr ""
+msgstr "Ändra synlighet för det valda lagret"
 
 msgid "Show layer"
-msgstr ""
+msgstr "Visa lager"
 
 msgid "Adjust opacity of the layer."
 msgstr "Justera genomskinlighet på lagret."
@@ -7435,7 +7465,7 @@ msgid "Adjust sharpness/blur value of the layer."
 msgstr ""
 
 msgid "Sharpness"
-msgstr ""
+msgstr "Skärpa"
 
 msgid "Adjust colorfulness of the layer."
 msgstr ""
@@ -7541,16 +7571,16 @@ msgid "Edit Tags"
 msgstr "Redigera taggar"
 
 msgid "Go to OSM wiki for tag help"
-msgstr ""
+msgstr "Gå till OSM wiki för hjälp om taggen"
 
 msgid "Launch browser with wiki help for selected object"
 msgstr "Starta webbläsare med wiki-hjälpen för det valda objektet"
 
 msgid "Go to Taginfo"
-msgstr ""
+msgstr "Gå till Taginfo"
 
 msgid "Launch browser with Taginfo statistics for selected object"
-msgstr ""
+msgstr "Öppna webbläsare med Taginfo-statistik för valt objekt"
 
 msgid "Paste Value"
 msgstr "Klistra in värde"
@@ -7565,19 +7595,19 @@ msgid "Copy the value of the selected tag to clipboard"
 msgstr "Kopiera värdet av den valda taggen till urklipp"
 
 msgid "Copy selected Key(s)/Value(s)"
-msgstr ""
+msgstr "Kopiera vald nyckel (nycklar)/värde (värden)"
 
 msgid "Copy the key and value of the selected tag(s) to clipboard"
-msgstr ""
+msgstr "Kopiera nyckel och värde för den/de valda taggarna till urklipp"
 
 msgid "Copy all Keys/Values"
 msgstr "Kopiera alla Nycklar/Värden"
 
 msgid "Copy the key and value of all the tags to clipboard"
-msgstr ""
+msgstr "Kopiera nyckel och värde för alla taggar till urklipp"
 
 msgid "Copy Tags"
-msgstr ""
+msgstr "Kopiera taggar"
 
 msgid "Search Key/Value/Type"
 msgstr "Sök Nyckel/Värde/Typ"
@@ -7641,7 +7671,7 @@ msgid "Please select a value"
 msgstr "Välj ett värde"
 
 msgid "Set number of recently added tags"
-msgstr ""
+msgstr "Ställ in antal nyligen tillagda taggar"
 
 msgid "Remember last used tags after a restart"
 msgstr ""
@@ -7650,7 +7680,7 @@ msgid "Recent tags with existing key"
 msgstr ""
 
 msgid "Enable"
-msgstr ""
+msgstr "Aktivera"
 
 msgid "Hide"
 msgstr "Dölj"
@@ -8286,9 +8316,6 @@ msgstr "Ange ett platsnamn att söka efter"
 msgid "Areas around places"
 msgstr "Områden runt platser"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr "Sök ..."
 
@@ -8873,6 +8900,9 @@ msgstr "Osparade ändringar - Spara/Ladda upp innan du avslutar?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Osparade ändringar - Spara/Ladda upp innan du raderar?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Skickar in och sparar modifierade lager ..."
 
@@ -8924,6 +8954,12 @@ msgstr "Avsluta nu!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Avsluta JOSM utan att spara. Ej sparade ändringar går förlorade."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Radera nu!"
 
@@ -8937,6 +8973,12 @@ msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 "Avsluta JOSM och spara. Ej sparade ändringar laddas upp och/eller sparas."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -11065,6 +11107,9 @@ msgstr "Rita pilar vid enkelriktat"
 msgid "Draw segment order numbers"
 msgstr "Rita ut segmentens ordningsnummer"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Rita gränser för hämtade data"
 
@@ -13193,6 +13238,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "Import från NMEA misslyckades!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13558,6 +13606,9 @@ msgstr "Laddar upp data ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "Hämtar data..."
 
@@ -14905,7 +14956,7 @@ msgstr "buskage"
 
 msgctxt "natural"
 msgid "wood"
-msgstr ""
+msgstr "naturskog"
 
 msgctxt "Relation type"
 msgid "associatedStreet"
@@ -15298,6 +15349,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Surface model)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15409,7 +15463,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15588,6 +15645,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15882,18 +15942,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15903,6 +15951,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -16035,6 +16086,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -16404,6 +16458,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Hämtar OSM-data längs en sträcka"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16518,6 +16575,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16725,6 +16785,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Gör ett enskilt hus till ett radhus."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16747,6 +16812,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16903,6 +16971,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -18227,6 +18299,9 @@ msgstr "konstruktion"
 msgid "Ford"
 msgstr "Vadställe"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Stigar och småvägar"
 
@@ -18848,11 +18923,11 @@ msgstr "Lavinskydd"
 
 msgctxt "main group"
 msgid "Water"
-msgstr ""
+msgstr "Vatten"
 
 msgctxt "sub group"
 msgid "Water"
-msgstr ""
+msgstr "Vatten"
 
 msgid "Drain"
 msgstr "Avlopp"
@@ -19854,6 +19929,9 @@ msgstr "Landningsbana"
 msgid "Taxiway"
 msgstr "Taxibana"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "Helikopterplatta"
 
@@ -20526,11 +20604,11 @@ msgstr "Punktnummer"
 msgid "Point Name"
 msgstr "Punktnamn"
 
-msgid "Phone Number"
-msgstr "Telefonnummer"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "Använd internationellt format, ex +12-345-67890"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -20544,6 +20622,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr "Hjärtstartare"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
 msgid "Located inside a building?"
 msgstr "Placerad inuti en byggnad?"
 
@@ -21021,7 +21105,7 @@ msgstr ""
 
 msgctxt "golf"
 msgid "Bunker"
-msgstr ""
+msgstr "Bunker"
 
 msgctxt "golf"
 msgid "Natural"
@@ -21413,6 +21497,10 @@ msgid "university"
 msgstr "universitet/högskola"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "sjukhus"
 
@@ -21497,6 +21585,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Våningsplan"
 
@@ -21993,16 +22085,16 @@ msgstr "Ytterkontur bro"
 
 msgctxt "preset group"
 msgid "Military"
-msgstr ""
+msgstr "Militärt"
 
 msgid "Airfield"
-msgstr ""
+msgstr "Flygfält"
 
 msgid "Barracks"
-msgstr ""
+msgstr "Förläggning/baracker"
 
 msgid "Bunker"
-msgstr ""
+msgstr "Bunker"
 
 msgid "pillbox"
 msgstr ""
@@ -22028,7 +22120,7 @@ msgid "Ruins"
 msgstr "Ruiner"
 
 msgid "Range"
-msgstr ""
+msgstr "Skjutbana"
 
 msgid "Power"
 msgstr "Elkraft"
@@ -23241,7 +23333,7 @@ msgid "Litecoin"
 msgstr ""
 
 msgid "Offices"
-msgstr ""
+msgstr "Kontor"
 
 msgctxt "office"
 msgid "Accountant"
@@ -23344,28 +23436,28 @@ msgid "Telecommunication"
 msgstr ""
 
 msgid "Craft"
-msgstr ""
+msgstr "Hantverkare"
 
 msgid "Carpenter"
-msgstr ""
+msgstr "Snickare"
 
 msgid "Shoemaker"
-msgstr ""
+msgstr "Skomakare"
 
 msgid "Photographer"
-msgstr ""
+msgstr "Fotograf"
 
 msgid "Metal construction"
 msgstr ""
 
 msgid "Electrician"
-msgstr ""
+msgstr "Elektriker"
 
 msgid "Brewery"
 msgstr ""
 
 msgid "Plumber"
-msgstr ""
+msgstr "Rörmokare"
 
 msgid "Sawmill"
 msgstr ""
@@ -23380,7 +23472,7 @@ msgid "Hvac"
 msgstr ""
 
 msgid "Painter"
-msgstr ""
+msgstr "Målare"
 
 msgid "Stonemason"
 msgstr ""
@@ -23392,16 +23484,16 @@ msgid "Pottery"
 msgstr ""
 
 msgid "Key cutter"
-msgstr ""
+msgstr "Låssmed"
 
 msgid "Caterer"
 msgstr ""
 
 msgid "Roofer"
-msgstr ""
+msgstr "Takläggare"
 
 msgid "Beekeeper"
-msgstr ""
+msgstr "Biodlare"
 
 msgid "Blacksmith"
 msgstr ""
@@ -23634,7 +23726,7 @@ msgid "Wood"
 msgstr "Naturskog"
 
 msgid "Woodland where timber production does not dominate use."
-msgstr ""
+msgstr "Skog där timmerproduktion inte är huvudsakligt användningsområde."
 
 msgid "Forest"
 msgstr "Kulturskog"
@@ -23704,8 +23796,14 @@ msgstr "Naturreservat"
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
-msgid "An accumulation of loose rocks."
-msgstr "En samling lösa stenar."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "Höglandshed"
@@ -23732,6 +23830,8 @@ msgid ""
 "free-draining infertile, acidic soils, and is characterised by open, low-"
 "growing woody vegetation."
 msgstr ""
+"Bar obrukbar mark med lågt busklandskap,  påträffas mest vid självdränerande "
+"obrukbara och sura jordar och karakteriseras av öppna lågväxande buskar."
 
 msgid "Sand"
 msgstr "Sand"
@@ -24378,16 +24478,10 @@ msgstr "Rutter"
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
+msgid "national"
 msgstr ""
 
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -24396,18 +24490,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -24420,18 +24502,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24624,9 +24694,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr "{0} utan {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} utan {1} eller {2}"
 
@@ -24636,6 +24717,12 @@ msgstr "{0} utan {1}, {2} eller {3}"
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24651,39 +24738,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr "restaurang utan namn"
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24702,9 +24774,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24759,10 +24840,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24778,7 +24865,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24823,7 +24910,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24857,6 +24944,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr "förkortat gatunamn"
 
@@ -24875,6 +24965,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24967,10 +25060,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -25216,6 +25312,27 @@ msgstr "Skickar in GPX-spår"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Skickar in spår till openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Importerar..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25554,6 +25671,403 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
+msgid "Mapillary Images"
+msgstr ""
+
+msgid "Mapillary layer"
+msgstr ""
+
+msgid "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr ""
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr "Importera bilder till sekvens"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Importera bilder till Mapillary-lager i en sekvens"
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr "Zooma till vald bild"
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+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 folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr "Logga ut"
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr ""
 
@@ -27217,9 +27731,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr "Zooma in för att se meddelanden"
 
-msgid "Login"
-msgstr ""
-
 msgid "Enable autologin"
 msgstr ""
 
@@ -27252,9 +27763,6 @@ msgstr "Privat chatt"
 msgid "Close tab"
 msgstr "Stäng flik"
 
-msgid "Logout"
-msgstr "Logga ut"
-
 msgid "Clear log"
 msgstr "Rensa logg"
 
@@ -27807,9 +28315,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -27979,21 +28484,9 @@ msgstr "Importerade bilder"
 msgid "Import vector graphics"
 msgstr "Importera vektorgrafik"
 
-msgid "Scale:"
-msgstr ""
-
-msgid "unit(s) = "
-msgstr ""
-
-msgid "Importing..."
-msgstr "Importerar..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
-msgstr ""
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -28198,6 +28691,61 @@ msgstr ""
 msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr ""
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -28453,400 +29001,6 @@ msgstr ""
 msgid "Missing input data"
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr "Importera bilder till sekvens"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importera bilder till Mapillary-lager i en sekvens"
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr "Zooma till vald bild"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-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 folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "Uppmätta värden."
 
@@ -30316,6 +30470,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "räls"
 
@@ -30411,9 +30568,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -31428,6 +31582,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Husrad"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31875,6 +32089,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Framåt"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32702,9 +32994,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32898,15 +33187,9 @@ msgstr "startar/pausar videouppspelning"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "Framåt"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 43e2226..492017f 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2015-10-28 15:55+0000\n"
 "Last-Translator: நவலடி <navaladi at gmail.com>\n"
 "Language-Team: Tamil <ta at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:32+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:09+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "X-Poedit-Country: INDIA\n"
 "Language: ta\n"
 "X-Poedit-Language: Tamil\n"
@@ -209,28 +209,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "பிழை"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "பிழை"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3314,9 +3314,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3718,10 +3715,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3758,6 +3755,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3767,6 +3767,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3803,6 +3806,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4021,6 +4030,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4231,30 +4246,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4498,9 +4513,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -5021,9 +5033,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6443,6 +6452,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6682,6 +6694,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7955,9 +7975,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8521,6 +8538,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8572,6 +8592,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8584,6 +8610,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10639,6 +10671,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12720,6 +12755,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13082,6 +13120,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14725,6 +14766,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14836,7 +14880,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15015,6 +15062,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15309,18 +15359,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15330,6 +15368,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15462,6 +15503,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15829,6 +15873,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15943,6 +15990,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16140,6 +16190,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16162,6 +16217,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16318,6 +16376,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17638,6 +17700,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19257,6 +19322,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19927,10 +19995,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19945,6 +20013,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20814,6 +20888,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20898,6 +20976,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23103,7 +23185,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23770,16 +23858,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23788,18 +23870,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23812,18 +23882,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24016,9 +24074,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24028,6 +24097,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24043,39 +24118,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24094,9 +24154,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24151,10 +24220,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24170,7 +24245,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24215,7 +24290,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24249,6 +24324,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24267,6 +24345,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24357,10 +24438,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24606,6 +24690,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24944,3267 +25049,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29672,6 +29814,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29767,9 +29912,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30781,6 +30923,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31228,6 +31430,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "முன்னோக்கு"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32054,9 +32334,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32250,15 +32527,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr "முன்னோக்கு"
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/te.po b/i18n/po/te.po
index ecd35c3..aa6d43b 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:33+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:10+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: te\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
-msgstr "దోషము"
-
-msgid "Select image format for WMS layer"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "WMS Error"
+msgid "Error"
+msgstr "దోషము"
+
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
+msgstr ""
+
+msgid "Align Ways"
 msgstr ""
 
 msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "Align Way Segments: Modes"
+msgstr ""
+
+msgid "Align Ways control panel"
+msgstr ""
+
+msgid "This panel activates in Align Ways mode:"
+msgstr ""
+
+msgid "Length preserved"
+msgstr ""
+
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Choose from..."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Select commune"
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align Ways mode"
+msgstr ""
+
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+msgid "AlignWayS message"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Change the current projection"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "off"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "50 m"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "100 m"
+msgid "What''s new..."
 msgstr ""
 
-msgid "high"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "medium"
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "low"
+msgid "Errr..."
 msgstr ""
 
-msgid "symbol"
+msgid "Browser not supported."
 msgstr ""
 
-msgid "parcel"
+msgid "Building address"
 msgstr ""
 
-msgid "parcel number"
+msgid "empty"
 msgstr ""
 
-msgid "address"
+msgid "skip"
 msgstr ""
 
-msgid "locality"
+msgid "House number:"
 msgstr ""
 
-msgid "section"
+msgid "Street:"
 msgstr ""
 
-msgid "commune"
+msgid "Post code:"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Building:"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Tags:"
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Name:"
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "updated building info"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "Tag Element"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "Select an item to tag."
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Tag Building"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Area Selection"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Area Selector"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Created area"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Algorithm"
 msgstr ""
 
-msgid "Layers:"
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Distance Tolerance"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Parcels."
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Use HSV based algorithm"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "show address dialog"
 msgstr ""
 
-msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Debug"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 328c8db..50bc9ba 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:34+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:10+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: th\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 2c8ad20..7d414ac 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
 "PO-Revision-Date: 2015-11-16 12:04+0000\n"
 "Last-Translator: Erkin Alp Güney <Unknown>\n"
 "Language-Team: Türkçe <>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:36+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:11+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -208,18 +208,6 @@ msgstr "Haritada seçili elemanları listedede seç."
 msgid "Add imagery layer {0}"
 msgstr "Referans görüntü katmanı ekle {0}"
 
-msgid "Error"
-msgstr "Hata"
-
-msgid "Select image format for WMS layer"
-msgstr ""
-
-msgid "Select WMS layers"
-msgstr "WMS katmanı seç"
-
-msgid "Add layers"
-msgstr "Katman ekle"
-
 msgid "Invalid service URL."
 msgstr "Geçersiz servis URL''si"
 
@@ -232,6 +220,18 @@ msgstr "WMS katman listesi getirilemedi."
 msgid "Could not parse WMS layer list."
 msgstr ""
 
+msgid "Error"
+msgstr "Hata"
+
+msgid "Select image format for WMS layer"
+msgstr ""
+
+msgid "Select WMS layers"
+msgstr "WMS katmanı seç"
+
+msgid "Add layers"
+msgstr "Katman ekle"
+
 msgid "Add Node..."
 msgstr "Nokta Ekle..."
 
@@ -3331,9 +3331,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3737,10 +3734,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3777,6 +3774,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr "Bu test sahil çizgisi doğrumu diye kontrol eder."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Ters çizilmiş sahil çizgisi: kara solda değil"
+
 msgid "Unconnected coastline"
 msgstr "Bağlanmamış sahil şeridi (coastline)"
 
@@ -3786,6 +3786,9 @@ msgstr "Sırasız sahil çizgisi"
 msgid "Reversed coastline"
 msgstr "Sahil şeridi tersine dön"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3822,6 +3825,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4040,6 +4049,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4253,30 +4268,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "Özellik anahtarı HTML bilgisi içeriyor"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr "Beni Düzelt!"
 
@@ -4528,9 +4543,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Bu test su, yer ve sahilçizgisi yönünü kontrol eder."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Ters çizilmiş sahil çizgisi: kara solda değil"
-
 msgid "Reversed land: land not on left side"
 msgstr "Ters çizilmiş yer: kara solda değil"
 
@@ -5050,9 +5062,6 @@ msgstr "Fare imleci üzerindeki coğrafi boylam."
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "tabaka listede yok."
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6471,6 +6480,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "Nesne tipi:"
 
@@ -6710,6 +6722,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "Değişiklik Takımlarım"
 
@@ -7984,9 +8004,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr "Yer konumunun civarındaki alanı"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı."
-
 msgid "Search ..."
 msgstr ""
 
@@ -8550,6 +8567,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8601,6 +8621,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8613,6 +8639,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10688,6 +10720,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr "Segment sıra numaralarını çiz"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "İndirilen alan için sınırları çiz"
 
@@ -12777,6 +12812,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "NMEA içeri alınmasında hata!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı."
+
 msgid "Note Files"
 msgstr ""
 
@@ -13141,6 +13179,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14791,6 +14832,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14902,7 +14946,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15081,6 +15128,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15375,18 +15425,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15396,6 +15434,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15528,6 +15569,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15895,6 +15939,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16009,6 +16056,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16206,6 +16256,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16228,6 +16283,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16384,6 +16442,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17704,6 +17766,9 @@ msgstr ""
 msgid "Ford"
 msgstr "sığ geçit"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "Yollar"
 
@@ -19323,6 +19388,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19993,11 +20061,11 @@ msgstr "Nokta Numarası"
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
-msgstr "Telefon Numarası"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -20011,6 +20079,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Telefon Numarası"
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20880,6 +20954,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20964,6 +21042,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23169,7 +23251,13 @@ msgstr "korunacak doğa alanı"
 msgid "Scree"
 msgstr "Taşlık Alan"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23836,16 +23924,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23854,18 +23936,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23878,18 +23948,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24082,9 +24140,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24094,6 +24163,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24109,39 +24184,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24160,9 +24220,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24217,10 +24286,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24236,7 +24311,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24281,7 +24356,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24315,6 +24390,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24333,6 +24411,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24423,10 +24504,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24672,6 +24756,27 @@ msgstr "İzleri Yükle"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "İzleri openstreetmap.org sitesine yükle"
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -25010,3279 +25115,3316 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
+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 "Parameter ''{0}'' must not be null"
+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 ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "AlignWayS message"
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Mapillary login"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Errr..."
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Building address"
+msgid "NanoLog"
 msgstr ""
 
-msgid "empty"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "skip"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "House number:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Street:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Post code:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Building:"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Name:"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "updated building info"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selection"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Created area"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Train a Model"
 msgstr ""
 
-msgid "Error Report"
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "edit new tag"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "Choose key"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "apply {0}"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid "Algorithm"
+msgid "Info: {0}"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "Error in timeformat"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "open end"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid "Debug"
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Odd"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Even"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Alphabetic"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Numeric"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Actual"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Estimate"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Potential"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Increment:"
 msgstr ""
 
-msgid "Create building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "City:"
 msgstr ""
 
-msgid "Length step:"
+msgid "State:"
 msgstr ""
 
-msgid "Advanced..."
+msgid "Post Code:"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "Country:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Expected odd numbers for addresses"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Expected even numbers for addresses"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Expected valid number for increment"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Country code must be 2 letters"
 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] ""
-
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "on polygon"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "Add address"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid "Next no"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Align Ways"
 msgstr ""
 
-msgid "Select Feuille"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
 msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Align way segment"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Choose from..."
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid "Select commune"
+msgid "Length preserved"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "Angle preserved"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Set background transparent."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "25 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "50 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "high"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
-msgstr "alçak"
-
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
-msgstr "adres"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "Thinning Iterations"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "show address dialog"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Show Address Dialog after mapping an area"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "merge nodes"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Merge nodes with existing nodes"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Debug"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Building Generalization"
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Create boundary"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Alert Message"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Street Name:"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Create building"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Auto-select building"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "Length step:"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Load layer from cache"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Load location from cache (only if cache is enabled)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "{0} not allowed with the current projection"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Set width of the building"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Merge address points"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "(optional)"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Change location"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Add a new municipality layer"
-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] ""
 
-msgid "Commune"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid "Departement"
+msgid "on polygon"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Add address"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Next no"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Reset cookie"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid "Select Feuille"
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Image cropping"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
 msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
 msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Choose from..."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Select commune"
 msgstr ""
 
-msgid "East"
+msgid "Auto sourcing"
 msgstr ""
 
-msgid "I use the mouse"
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid "Adjust WMS"
-msgstr "WMS ayarla"
-
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Reset offset"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "Blank Layer"
-msgstr "Boş Tabaka"
-
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Is vectorized."
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "off"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "25 m"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "50 m"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "100 m"
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "high"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "medium"
 msgstr ""
 
-msgid "Use"
-msgstr "Kullan"
+msgid "low"
+msgstr "alçak"
 
-msgid "Please select a scheme to use."
-msgstr "Kullanmak için şema seçiniz."
+msgid "symbol"
+msgstr ""
 
-msgid "Color Scheme"
-msgstr "Renk Şeması"
+msgid "parcel"
+msgstr ""
 
-msgid "Please select the scheme to delete."
-msgstr "Silinecek şemayı seçiniz."
+msgid "parcel number"
+msgstr ""
 
-msgid "Use the selected scheme from the list."
-msgstr "listeden seçilen şemayı kullan."
+msgid "address"
+msgstr "adres"
 
-msgid "Use the current colors as a new color scheme."
-msgstr "Aktşf renkleri yeni renk şeması olarak kullan."
+msgid "locality"
+msgstr ""
 
-msgid "Delete the selected scheme from the list."
-msgstr "Seçili şemayı sil."
+msgid "section"
+msgstr ""
 
-msgid "Color Schemes"
-msgstr "Renk Şeması"
+msgid "commune"
+msgstr ""
 
-msgid "Conflate object pair"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Max. cache size (in MB)"
+msgstr ""
 
-msgid "Conflation"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Matches"
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Reference only"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Subject only"
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Configure"
-msgstr "konfigüre"
+msgid "Image resolution:"
+msgstr ""
 
-msgid "Configure conflation options"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Medium resolution (800x600)"
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Conflate"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-msgid "Match finder settings"
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Match finder method"
+msgid "Layers:"
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid "Parcels."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Layer:"
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Subject"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Empty selection"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Create buildings"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "Download Settings"
+msgid "Create boundary"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Image already loaded"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Requires restart"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "Max threads"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Extra download area"
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Max download area"
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Georeferencing interrupted"
 msgstr ""
 
-msgid "Download strategy"
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Split area"
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid "Coordinates imported: "
-msgstr "İçeri alınan koordinatlar: "
+msgid "The location {0} is already on screen. Cache not loaded."
+msgstr ""
 
-msgid "Format errors: "
+msgid "(optional)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Change location"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download along..."
+msgid "Commune"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Download Along"
+msgid "Departement"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Add new layer"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "EditGpx"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "Save image as..."
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Import path from GPX layer"
-msgstr "Yolu GPX tabakasından içeri al"
-
-msgid "Drop existing path"
-msgstr "Var olan yolu iptal et"
-
-msgid "No GPX data layer found."
-msgstr "GPX veri tabaksı bulunamadı."
-
-msgid "External tool error"
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Export image (only raster images)"
 msgstr ""
 
 msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
-msgstr ""
-
-msgid "exttool:{0}"
-msgstr ""
-
-msgid "External Tool: {0}"
-msgstr ""
-
-msgid "Edit tool"
-msgstr ""
-
-msgid "CmdLine:"
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "External tools"
+msgid "Image cropping"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "Are you sure?"
-msgstr "Emin misiniz?"
-
-msgid "New tool..."
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "Install"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "Public"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "East"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "GeoChat"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Login"
-msgstr ""
+msgid "Adjust WMS"
+msgstr "WMS ayarla"
 
-msgid "Enable autologin"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "User {0} has left"
-msgstr ""
+msgid "Blank Layer"
+msgstr "Boş Tabaka"
 
-msgid "User {0} is mapping nearby"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Users mapping nearby:"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Private chat"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "Close tab"
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Logout"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Clear log"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Show users on map"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Position only"
-msgstr "Pozisyon Sadece"
-
-msgid "Position, Time, Date, Speed"
-msgstr "Pozisyon, Zaman, Tarih, Hız"
-
-msgid "Position, Time, Date, Speed, Altitude"
-msgstr "Pozisyon, Zaman, Tarih, Hız, Yükseklik"
-
-msgid "A By Time"
-msgstr "A Zamana göre"
-
-msgid "A By Distance"
-msgstr "A Mesafeye Göre"
-
-msgid "B By Time"
-msgstr "B Zamana göre"
-
-msgid "B By Distance"
-msgstr "B Mesafeye Göre"
-
-msgid "C By Time"
-msgstr "C Zamana göre"
-
-msgid "C By Distance"
-msgstr "C Mesafeye Göre"
-
-msgid "Data Logging Format"
-msgstr "Veri loglama formatı"
+msgid "Use"
+msgstr "Kullan"
 
-msgid "Disable data logging if speed falls below"
-msgstr "Hız bu değerin altına düşerşe veri loglamayı kapat"
+msgid "Please select a scheme to use."
+msgstr "Kullanmak için şema seçiniz."
 
-msgid "Disable data logging if distance falls below"
-msgstr "Mesafe bu değerin altına düşerşe veri loglamayı kapat"
+msgid "Color Scheme"
+msgstr "Renk Şeması"
 
-msgid "Unknown logFormat"
-msgstr "Bilinmeyen logFormat"
+msgid "Please select the scheme to delete."
+msgstr "Silinecek şemayı seçiniz."
 
-msgid "Port:"
-msgstr "Port:"
+msgid "Use the selected scheme from the list."
+msgstr "listeden seçilen şemayı kullan."
 
-msgid "refresh the port list"
-msgstr "port listesini güncelle"
+msgid "Use the current colors as a new color scheme."
+msgstr "Aktşf renkleri yeni renk şeması olarak kullan."
 
-msgid "Configure Device"
-msgstr "Aracı Konfigüre et"
+msgid "Delete the selected scheme from the list."
+msgstr "Seçili şemayı sil."
 
-msgid "Connection Error."
-msgstr "Bağlantı Hatası."
+msgid "Color Schemes"
+msgstr "Renk Şeması"
 
-msgid "configure the connected DG100"
-msgstr "Bağlı DG100 ü ayarla"
+msgid "Conflate object pair"
+msgstr ""
 
-msgid "delete data after import"
-msgstr "verinin içeri alınmasından sonra sil"
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Importing data from device."
-msgstr "Aletten veri alınıyor."
+msgid "Conflation"
+msgstr ""
 
-msgid "Importing data from DG100..."
-msgstr "DG100 den veri alınıyor..."
+msgid "Activates the conflation plugin"
+msgstr ""
 
-msgid "Error deleting data."
-msgstr "Veri silinmesinde hata."
+msgid "Matches"
+msgstr ""
 
-msgid "imported data from {0}"
-msgstr "veri burdan yüklendi {0}"
+msgid "Reference only"
+msgstr ""
 
-msgid "No data found on device."
-msgstr "Cihazda veri bulunamadı."
+msgid "Subject only"
+msgstr ""
 
-msgid "Connection failed."
-msgstr "Bağlantı hatası."
+msgid "Matches ({0})"
+msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Reference only ({0})"
 msgstr ""
-"rxtxSerial kütüphanesi yüklenemedi. Manuel yükleme içinhttp://www.raphael-"
-"mack.de/josm-globalsat-gpx-import-plugin/"
 
-msgid "Globalsat Import"
-msgstr "Globalsat İçeri AL"
+msgid "Subject only ({0})"
+msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr "Globalsat Datalogger DG100 ’dan veriyi GPX tabakasına al."
+msgid "Configure"
+msgstr "konfigüre"
 
-msgid "Import"
-msgstr "İçeri Al"
+msgid "Configure conflation options"
+msgstr ""
 
-msgid "GPS Blams"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "Conflate"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Tag without key"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Layer:"
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid "Subject"
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Restore subject selection"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid "Empty selection"
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Settings"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "File not found:\n"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "height (m)"
+msgid "Requires restart"
 msgstr ""
 
-msgid "width (m)"
+msgid "Max threads"
 msgstr ""
 
-msgid "length (m)"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "weight (t)"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "axleload (t)"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Bookmark name"
-msgstr "Yer iminin adı:"
-
-msgid "Bookmark name already exists!"
-msgstr "Yer imi zaten var!"
-
-msgid "Bookmark name must not contain ''{0}''!"
-msgstr "Yer iminin adı içindeki ''{0}'' geçersiz!"
-
-msgid "Access class"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Vehicle properties"
-msgstr "Araç Özellikleri"
-
-msgid "Road requirements"
+msgid "Max download area"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Split area"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
 msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
-msgstr ""
+msgid "Coordinates imported: "
+msgstr "İçeri alınan koordinatlar: "
 
-msgid "Change bookmark"
-msgstr "Yer imi değiştir"
+msgid "Format errors: "
+msgstr ""
 
-msgid "Edit access parameters"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "default"
+msgid "Download along..."
 msgstr ""
 
-msgid "end nodes"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid "incline"
+msgid "Download Along"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "Parameters:"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Coloring:"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "Create/update graph"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "Graphview"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "EditGpx"
 msgstr ""
 
-msgid "Ruleset"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Select directory"
+msgid "Import path from GPX layer"
+msgstr "Yolu GPX tabakasından içeri al"
+
+msgid "Drop existing path"
+msgstr "Var olan yolu iptal et"
+
+msgid "No GPX data layer found."
+msgstr "GPX veri tabaksı bulunamadı."
+
+msgid "External tool error"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Restore defaults"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Visualization"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Node color"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Arrow color"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "External tools"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "New bookmark"
-msgstr "Yeni yer imi"
+msgid "Are you sure?"
+msgstr "Emin misiniz?"
 
-msgid "Really delete \"{0}\"?"
+msgid "New tool..."
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "Install"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "Public"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Choose node color"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "GeoChat"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "graphview arrowhead core"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "not logged in"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "Failed to send message:"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Private chat"
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "Close tab"
 msgstr ""
 
-msgid "XML Imagery Bounds"
-msgstr "XML Görüntü Çerçevesi"
+msgid "Clear log"
+msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Show users on map"
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Loading json file..."
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Calibration Layer"
-msgstr ""
+msgid "Position only"
+msgstr "Pozisyon Sadece"
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgid "Position, Time, Date, Speed"
+msgstr "Pozisyon, Zaman, Tarih, Hız"
 
-msgid "A calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr "Pozisyon, Zaman, Tarih, Hız, Yükseklik"
 
-msgid "Change Color"
-msgstr ""
+msgid "A By Time"
+msgstr "A Zamana göre"
 
-msgid "Deprecate Offset"
-msgstr ""
+msgid "A By Distance"
+msgstr "A Mesafeye Göre"
 
-msgid "Are you sure this imagery offset is wrong?"
-msgstr ""
+msgid "B By Time"
+msgstr "B Zamana göre"
 
-msgid "Are you sure this calibration geometry is aligned badly?"
-msgstr ""
+msgid "B By Distance"
+msgstr "B Mesafeye Göre"
 
-msgid "Warning: deprecation is basically irreversible!"
-msgstr ""
+msgid "C By Time"
+msgstr "C Zamana göre"
 
-msgid "To store imagery offsets you must be a registered OSM user."
-msgstr ""
+msgid "C By Distance"
+msgstr "C Mesafeye Göre"
+
+msgid "Data Logging Format"
+msgstr "Veri loglama formatı"
+
+msgid "Disable data logging if speed falls below"
+msgstr "Hız bu değerin altına düşerşe veri loglamayı kapat"
+
+msgid "Disable data logging if distance falls below"
+msgstr "Mesafe bu değerin altına düşerşe veri loglamayı kapat"
+
+msgid "Unknown logFormat"
+msgstr "Bilinmeyen logFormat"
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "port listesini güncelle"
+
+msgid "Configure Device"
+msgstr "Aracı Konfigüre et"
+
+msgid "Connection Error."
+msgstr "Bağlantı Hatası."
+
+msgid "configure the connected DG100"
+msgstr "Bağlı DG100 ü ayarla"
+
+msgid "delete data after import"
+msgstr "verinin içeri alınmasından sonra sil"
+
+msgid "Importing data from device."
+msgstr "Aletten veri alınıyor."
+
+msgid "Importing data from DG100..."
+msgstr "DG100 den veri alınıyor..."
+
+msgid "Error deleting data."
+msgstr "Veri silinmesinde hata."
+
+msgid "imported data from {0}"
+msgstr "veri burdan yüklendi {0}"
+
+msgid "No data found on device."
+msgstr "Cihazda veri bulunamadı."
+
+msgid "Connection failed."
+msgstr "Bağlantı hatası."
 
 msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
+"rxtxSerial kütüphanesi yüklenemedi. Manuel yükleme içinhttp://www.raphael-"
+"mack.de/josm-globalsat-gpx-import-plugin/"
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Globalsat Import"
+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 ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "GPSBlam"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "GPX Data"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Offset"
+msgid "Class element without name"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid "mm"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid "cm"
+msgid "Tag without key"
 msgstr ""
 
-msgid "m"
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "km"
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "Offset Information"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid "Determined right here"
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Reason"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "No ruleset"
 msgstr ""
 
 msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
 msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+"File not found:\n"
+"{0}"
 msgstr ""
 
 msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "File not found:\n"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "height (m)"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "width (m)"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "length (m)"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "weight (t)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "axleload (t)"
 msgstr ""
 
-msgid "Normal"
-msgstr "Normal"
+msgid "Bookmark name"
+msgstr "Yer iminin adı:"
 
-msgid "Rotate 90"
-msgstr "Dönder 90"
+msgid "Bookmark name already exists!"
+msgstr "Yer imi zaten var!"
 
-msgid "Rotate 180"
-msgstr "Dönder 180"
+msgid "Bookmark name must not contain ''{0}''!"
+msgstr "Yer iminin adı içindeki ''{0}'' geçersiz!"
 
-msgid "Rotate 270"
-msgstr "Dönder 270"
+msgid "Access class"
+msgstr ""
 
-msgid "Previous image"
-msgstr "Önceki Görüntü"
+msgid "Access class must not contain ''{0}''!"
+msgstr ""
 
-msgid "Next image"
-msgstr "Sonraki Görüntü"
+msgid "Access types"
+msgstr ""
 
-msgid "Rotate left"
-msgstr "Sola Dönder"
+msgid "Vehicle properties"
+msgstr "Araç Özellikleri"
 
-msgid "Rotate image left"
-msgstr "Görüntüyü sola dönder"
+msgid "Road requirements"
+msgstr ""
 
-msgid "Rotate right"
-msgstr "Görüntüyü sağa dönder"
-
-msgid "Rotate image right"
-msgstr "Görüntüyü sağa dönder"
-
-msgid "WayPoint Image"
-msgstr "Yol noktaları görüntüsü"
-
-msgid "Display non-geotagged photos"
-msgstr "Gotag yapılmamış görüntüleri göster"
+msgid "Max. incline up (%, pos.)"
+msgstr ""
 
-msgid "Imported Images"
-msgstr "İçeri alınan görüntüler"
+msgid "Maximum incline the vehicle can go up"
+msgstr ""
 
-msgid "Import vector graphics"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Scale:"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Importing..."
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Change bookmark"
+msgstr "Yer imi değiştir"
+
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Structure type:"
+msgid "default"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "end nodes"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "incline"
 msgstr ""
 
-msgid "POWER"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Parameters:"
 msgstr ""
 
-msgid "Working Level"
+msgid "Coloring:"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "Level Name"
+msgid "Graphview"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "Select directory"
 msgstr ""
 
-msgid "Fitting"
+msgid "Vehicle"
 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>"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Visualization"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Node color"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Arrow color"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "InfoMode"
+msgid "New bookmark"
+msgstr "Yeni yer imi"
+
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "GPX info mode"
+msgid "Bookmark deletion"
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Delete this"
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Delete this&older"
+msgid "Choose node color"
 msgstr ""
 
-msgid "km/h"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Track name: "
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "graphview default node"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "filtering ways"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "XML Imagery Bounds"
+msgstr "XML Görüntü Çerçevesi"
+
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "junctions"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Change Color"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Check "
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Search "
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
 msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
-msgstr "Başlangıç noktası seçim alanı içinde değil"
+msgid "Error processing XML response: {0}"
+msgstr ""
 
-msgid "Looking for shoreline..."
-msgstr "Kıyı şeridi aranıyor..."
+msgid "Offset"
+msgstr ""
 
-msgid "{0} nodes so far..."
-msgstr "bulunan noktalar {0}..."
+msgid "Imagery Offset Database"
+msgstr ""
 
-msgid "Lake Walker."
-msgstr "Göl Yürüyüşü."
+msgid "mm"
+msgstr ""
 
-msgid "Lake Walker"
-msgstr "Göl Yürüyüşü"
+msgid "cm"
+msgstr ""
 
-msgid "Error creating cache directory: {0}"
-msgstr "Hafıza alanı oluşturulamadı(cache): {0}"
+msgid "km"
+msgstr ""
 
-msgid "Tracing"
-msgstr "İzleniyor"
+msgid "Calibration geometries"
+msgstr ""
 
-msgid "checking cache..."
-msgstr "hafıza kontrol ediliyor..."
+msgid "Deprecated offsets"
+msgstr ""
 
-msgid "Running vertex reduction..."
-msgstr "vertex düzeltme çalıştırıldı..."
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
-msgstr "Douglas-Peucker çalışması yapılıyor..."
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
+msgstr ""
 
-msgid "Removing duplicate nodes..."
-msgstr "Çift noktalar kaldırılıyor..."
+msgid "Deprecated by {0} on {1}"
+msgstr ""
 
-msgid "Lakewalker trace"
-msgstr "Gölyürüyüşü takip ediliyor"
+msgid "Created by {0} on {1}"
+msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "Offset Information"
 msgstr ""
 
-msgid "east"
-msgstr "doğu"
+msgid "Report this offset"
+msgstr ""
 
-msgid "northeast"
-msgstr "kuzeydoğu"
-
-msgid "north"
-msgstr "kuzey"
-
-msgid "northwest"
-msgstr "kuzeybat"
-
-msgid "west"
-msgstr "batı"
+msgid "You are to notify moderators of this offset. Why?"
+msgstr ""
 
-msgid "southwest"
-msgstr "güneybatı"
+msgid "Reporting the offset..."
+msgstr ""
 
-msgid "south"
-msgstr "güney"
+msgid "An imagery offset of {0}"
+msgstr ""
 
-msgid "southeast"
-msgstr "güneydoğu"
+msgid "Imagery ID"
+msgstr ""
 
-msgid "coastline"
-msgstr "Kıyı çizgisi"
+msgid "A calibration geometry of {0} nodes"
+msgstr ""
 
-msgid "land"
-msgstr "yer"
+msgid "Determined right here"
+msgstr ""
 
-msgid "Maximum number of segments per way"
-msgstr "Her yol için max segment sayısı"
+msgid "Determined {0} away"
+msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
-msgstr "İlk iz için max nokta sayısı"
+msgid "Reason"
+msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
-msgstr "Max gri seviyesi, su için (0-255)"
+msgid "This entry has been reported."
+msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
-msgstr "çizgi basitleştirme doğruluğu (derece)"
+msgid "Server has rejected the request"
+msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr "Landsat mozaik çözünürlüğü (derece başına pixel)"
+msgid "Unable to connect to the server"
+msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
-msgstr "Landsat mozaik boyutu (pixel)"
+msgid "Store Imagery Offset..."
+msgstr ""
 
-msgid "Shift all traces to east (degrees)"
-msgstr "Bütün izleri doğuya taşı (derece)"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
+msgstr ""
 
-msgid "Shift all traces to north (degrees)"
-msgstr "Bütün izleri kuzaye taşı (derece)"
+msgid "Store calibration geometry"
+msgstr ""
 
-msgid "Direction to search for land"
-msgstr "Karaya doğru yön araması"
+msgid "Store imagery offset"
+msgstr ""
 
-msgid "Tag ways as"
-msgstr "Yolları şu şekilde etiketle"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
+msgstr ""
 
-msgid "WMS Layer"
-msgstr "WMS Tabakası"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
+msgstr ""
 
-msgid "Maximum cache size (MB)"
-msgstr "Max. Hafıza Boyutu (MB)"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
+msgstr ""
 
-msgid "Maximum cache age (days)"
-msgstr "Max. Hafızada tutma (gün)"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
+msgstr ""
 
-msgid "Source text"
-msgstr "Kaynak Metin"
+msgid "Uploading a new offset..."
+msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
-msgstr "Gölyürüyüşü eklentisi tercihleri"
+msgid "This string should be 3 to 200 letters long."
+msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "Landsat imajı üzerinde su alanını tespit eden eklenti."
+msgid "Adjust imagery"
+msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
-msgstr "Oluşturulan yol için max. segment sayısı. Varsayılan 250."
+msgid "Adjust the position of the selected imagery layer"
+msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Please select the imagery layer to adjust."
 msgstr ""
-"Sıkıştırmadan önceki max. nokta sayısı (yolların basitleştirmeden önce). "
-"Varsayılan 50000."
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "Start adjusting"
 msgstr ""
-"Max gri seviye, su kabulu için (Landsat IR-1 verisi için). 0-255 "
-"arasıVarsayılan:90."
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
-"Douglas-Peucker hat basitleştirme hassasiyeti, açı olarak verilir.<br>düşük "
-"değerler çok ve hassas nokta oluşturur. Varsayılan 0.0003."
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "No layers to adjust"
 msgstr ""
-"Landsat mozaik çözünürlüğü, derece başına pixel oalrak ölçülür. "
-"Varsayılan:4000"
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr "Landsat mozaik boyutu. Varsayılan 2000."
+msgid "Normal"
+msgstr "Normal"
 
-msgid "Offset all points in East direction (degrees). Default 0."
-msgstr "Bütün noktaları doğuya hizala (derece). Varsayılan 0."
+msgid "Rotate 90"
+msgstr "Dönder 90"
 
-msgid "Offset all points in North direction (degrees). Default 0."
-msgstr "Bütün noktaları kuzeye hizala (derece). Varsayılan 0."
+msgid "Rotate 180"
+msgstr "Dönder 180"
 
-msgid "Direction to search for land. Default east."
-msgstr "Yer aramak için yön. Varsayılan Doğu."
+msgid "Rotate 270"
+msgstr "Dönder 270"
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr ""
-"Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su."
+msgid "Previous image"
+msgstr "Önceki Görüntü"
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr "Hangi WMS tabaksı iz takibi için kullanılsın."
+msgid "Next image"
+msgstr "Sonraki Görüntü"
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr "Çalışma hafızası boyutu, byte olarak. Varsayılan 300MB"
+msgid "Rotate left"
+msgstr "Sola Dönder"
 
-msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "Çalışma alanında saklanılan dosyaların max yaşı (gün).Varsayılan 100"
+msgid "Rotate image left"
+msgstr "Görüntüyü sola dönder"
 
-msgid "Data source text. Default is Landsat."
-msgstr "Veri kaynak metni. Varsayılan landsat"
+msgid "Rotate right"
+msgstr "Görüntüyü sağa dönder"
 
-msgid "Downloading image tile..."
-msgstr "Görüntü mozaiği indiriliyor..."
+msgid "Rotate image right"
+msgstr "Görüntüyü sağa dönder"
 
-msgid "Could not acquire image"
-msgstr "Görünüt alınamadı"
+msgid "WayPoint Image"
+msgstr "Yol noktaları görüntüsü"
 
-msgid "Connection Failed"
-msgstr "Bağlantı Hatası"
+msgid "Display non-geotagged photos"
+msgstr "Gotag yapılmamış görüntüleri göster"
 
-msgid "Not connected"
-msgstr "Bağlı Değil"
+msgid "Imported Images"
+msgstr "İçeri alınan görüntüler"
 
-msgid "Connecting"
-msgstr "Bağlanıyor"
+msgid "Import vector graphics"
+msgstr ""
 
-msgid "Connected"
-msgstr "Bağlı"
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
 
-msgid "no name"
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Live GPS"
-msgstr "Canlı GPS"
+msgid "Opens up a wizard to create a concourse"
+msgstr ""
 
-msgid "Show GPS data."
-msgstr "GPS verisini göster."
+msgid "Vertical layer:"
+msgstr ""
 
-msgid "Status"
-msgstr "Durum"
+msgid "Structure type:"
+msgstr ""
 
-msgid "Way Info"
-msgstr "Yol bİlgisis"
+msgid "Offset into background:"
+msgstr ""
 
-msgid "Speed"
-msgstr "Hız"
+msgid "Indoor Mapping Helper"
+msgstr ""
 
-msgid "Course"
-msgstr "Yön"
+msgid "POWER"
+msgstr ""
 
-msgid "LiveGPS layer"
-msgstr "Canlı GPS tabakası"
+msgid "Activates the plug-in"
+msgstr ""
 
-msgid "Capture GPS Track"
-msgstr "GPS izini takip et"
+msgid "Working Level"
+msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "Selects the working level."
 msgstr ""
-"gpsd server ına bağlan ve şu anki pozsiyonu CanlıGPS tabakasında göster"
 
-msgid "Center Once"
-msgstr "Merkeze koy"
+msgid "Level Name"
+msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
-msgstr "Canlı GPS verilerini tabakadfa merkeze koy."
+msgid "Optional name-tag for a level."
+msgstr ""
 
-msgid "Auto-Center"
-msgstr "Otomatik-Merkezleme"
+msgid "The object preset you want to tag."
+msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
-msgstr "Devamlı olarak canlı GPS tabakasını görüntünün ortasına getir"
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
 
-msgid "Open MapDust"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "Fitting"
 msgstr ""
 
-msgid "Missing input data"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "Total images:"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "images"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Mapillary"
+msgid "InfoMode"
+msgstr ""
+
+msgid "GPX info mode"
+msgstr ""
+
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "Delete this"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "km/h"
 msgstr ""
 
-msgid "Export pictures"
+msgid "Track name: "
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Export images"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Import pictures"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "Import local pictures"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Select pictures"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Join mode"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Upload pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Upload pictures."
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Walk mode"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "View in website"
+msgid "Check "
 msgstr ""
 
-msgid "Copy key"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Search "
 msgstr ""
 
-msgid "Edit on website"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Submit"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Export all images"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Select a folder"
+msgid "Correct"
 msgstr ""
 
-msgid "Explore"
+msgid "Wrong"
 msgstr ""
 
-msgid "Select a directory"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Speed limit"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Give way"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "No entry"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Intersection danger"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "No parking"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "No overtaking"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Replace way"
 msgstr ""
 
-msgid "No turn"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Years"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Geometriyi değiştir"
 
-msgid "Months"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Days"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "Imported images"
-msgstr ""
+msgid "The starting location was not within the bbox"
+msgstr "Başlangıç noktası seçim alanı içinde değil"
 
-msgid "Mapillary filter"
-msgstr ""
+msgid "Looking for shoreline..."
+msgstr "Kıyı şeridi aranıyor..."
 
-msgid "Open Mapillary filter dialog"
-msgstr ""
+msgid "{0} nodes so far..."
+msgstr "bulunan noktalar {0}..."
 
-msgid "Not older than: "
-msgstr ""
+msgid "Lake Walker."
+msgstr "Göl Yürüyüşü."
 
-msgid "Downloaded images"
-msgstr ""
+msgid "Lake Walker"
+msgstr "Göl Yürüyüşü"
 
-msgid "Only images with signs"
-msgstr ""
+msgid "Error creating cache directory: {0}"
+msgstr "Hafıza alanı oluşturulamadı(cache): {0}"
 
-msgid "Choose signs"
-msgstr ""
+msgid "Tracing"
+msgstr "İzleniyor"
 
-msgid "Mapillary history"
-msgstr ""
+msgid "checking cache..."
+msgstr "hafıza kontrol ediliyor..."
 
-msgid "Open Mapillary history dialog"
-msgstr ""
+msgid "Running vertex reduction..."
+msgstr "vertex düzeltme çalıştırıldı..."
 
-msgid "Mapillary picture"
-msgstr ""
+msgid "Running Douglas-Peucker approximation..."
+msgstr "Douglas-Peucker çalışması yapılıyor..."
 
-msgid "Open Mapillary window"
-msgstr ""
+msgid "Removing duplicate nodes..."
+msgstr "Çift noktalar kaldırılıyor..."
 
-msgid "Mapillary dialog"
-msgstr ""
+msgid "Lakewalker trace"
+msgstr "Gölyürüyüşü takip ediliyor"
 
-msgid "Open Mapillary main dialog"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Next picture"
-msgstr ""
+msgid "east"
+msgstr "doğu"
 
-msgid "Shows the next picture in the sequence"
-msgstr ""
+msgid "northeast"
+msgstr "kuzeydoğu"
 
-msgid "Previous picture"
-msgstr ""
+msgid "north"
+msgstr "kuzey"
 
-msgid "Shows the previous picture in the sequence"
-msgstr ""
+msgid "northwest"
+msgstr "kuzeybat"
 
-msgid "Jump to red"
-msgstr ""
+msgid "west"
+msgstr "batı"
 
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
+msgid "southwest"
+msgstr "güneybatı"
 
-msgid "Jump to blue"
-msgstr ""
+msgid "south"
+msgstr "güney"
 
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
+msgid "southeast"
+msgstr "güneydoğu"
 
-msgid "Stops the walk."
-msgstr ""
+msgid "coastline"
+msgstr "Kıyı çizgisi"
 
-msgid "Play"
-msgstr ""
+msgid "land"
+msgstr "yer"
 
-msgid "Continues with the paused walk."
-msgstr ""
+msgid "Maximum number of segments per way"
+msgstr "Her yol için max segment sayısı"
 
-msgid "Pause"
-msgstr ""
+msgid "Maximum number of nodes in initial trace"
+msgstr "İlk iz için max nokta sayısı"
 
-msgid "Pauses the walk."
-msgstr ""
+msgid "Maximum gray value to count as water (0-255)"
+msgstr "Max gri seviyesi, su için (0-255)"
 
-msgid "Display hour when the picture was taken"
-msgstr ""
+msgid "Line simplification accuracy (degrees)"
+msgstr "çizgi basitleştirme doğruluğu (derece)"
 
-msgid "Use 24 hour format"
-msgstr ""
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr "Landsat mozaik çözünürlüğü (derece başına pixel)"
 
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
+msgid "Size of Landsat tiles (pixels)"
+msgstr "Landsat mozaik boyutu (pixel)"
 
-msgid "Preview images when hovering its icon"
-msgstr ""
+msgid "Shift all traces to east (degrees)"
+msgstr "Bütün izleri doğuya taşı (derece)"
 
-msgid "Download mode"
+msgid "Shift all traces to north (degrees)"
+msgstr "Bütün izleri kuzaye taşı (derece)"
+
+msgid "Direction to search for land"
+msgstr "Karaya doğru yön araması"
+
+msgid "Tag ways as"
+msgstr "Yolları şu şekilde etiketle"
+
+msgid "WMS Layer"
+msgstr "WMS Tabakası"
+
+msgid "Maximum cache size (MB)"
+msgstr "Max. Hafıza Boyutu (MB)"
+
+msgid "Maximum cache age (days)"
+msgstr "Max. Hafızada tutma (gün)"
+
+msgid "Source text"
+msgstr "Kaynak Metin"
+
+msgid "Lakewalker Plugin Preferences"
+msgstr "Gölyürüyüşü eklentisi tercihleri"
+
+msgid "A plugin to trace water bodies on Landsat imagery."
+msgstr "Landsat imajı üzerinde su alanını tespit eden eklenti."
+
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
+msgstr "Oluşturulan yol için max. segment sayısı. Varsayılan 250."
+
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
+"Sıkıştırmadan önceki max. nokta sayısı (yolların basitleştirmeden önce). "
+"Varsayılan 50000."
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
+"Max gri seviye, su kabulu için (Landsat IR-1 verisi için). 0-255 "
+"arasıVarsayılan:90."
 
-msgid "You are currently not logged in."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
+"Douglas-Peucker hat basitleştirme hassasiyeti, açı olarak verilir.<br>düşük "
+"değerler çok ve hassas nokta oluşturur. Varsayılan 0.0003."
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
+"Landsat mozaik çözünürlüğü, derece başına pixel oalrak ölçülür. "
+"Varsayılan:4000"
 
-msgid "Upload selected sequence"
-msgstr ""
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgstr "Landsat mozaik boyutu. Varsayılan 2000."
 
-msgid "Delete after upload"
-msgstr ""
+msgid "Offset all points in East direction (degrees). Default 0."
+msgstr "Bütün noktaları doğuya hizala (derece). Varsayılan 0."
 
-msgid "Wait for full quality pictures"
-msgstr ""
+msgid "Offset all points in North direction (degrees). Default 0."
+msgstr "Bütün noktaları kuzeye hizala (derece). Varsayılan 0."
 
-msgid "Follow selected image"
-msgstr ""
+msgid "Direction to search for land. Default east."
+msgstr "Yer aramak için yön. Varsayılan Doğu."
 
-msgid "Go forward"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
+"Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su."
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgstr "Hangi WMS tabaksı iz takibi için kullanılsın."
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr "Çalışma hafızası boyutu, byte olarak. Varsayılan 300MB"
 
-msgid "2 images joined"
-msgstr ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr "Çalışma alanında saklanılan dosyaların max yaşı (gün).Varsayılan 100"
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Data source text. Default is Landsat."
+msgstr "Veri kaynak metni. Varsayılan landsat"
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr "Görüntü mozaiği indiriliyor..."
 
-msgid "2 images unjoined"
-msgstr ""
+msgid "Could not acquire image"
+msgstr "Görünüt alınamadı"
 
-msgid "everything in the visible area"
-msgstr ""
+msgid "Connection Failed"
+msgstr "Bağlantı Hatası"
 
-msgid "areas with downloaded OSM-data"
-msgstr ""
+msgid "Not connected"
+msgstr "Bağlı Değil"
 
-msgid "only when manually requested"
-msgstr ""
+msgid "Connecting"
+msgstr "Bağlanıyor"
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
+msgid "Connected"
+msgstr "Bağlı"
 
-msgid "Downloading"
+msgid "no name"
 msgstr ""
 
-msgid "Select mode"
-msgstr ""
+msgid "Live GPS"
+msgstr "Canlı GPS"
 
-msgid "Mapillary login"
-msgstr ""
+msgid "Show GPS data."
+msgstr "GPS verisini göster."
 
-msgid "Login successful, return to JOSM."
-msgstr ""
+msgid "Status"
+msgstr "Durum"
 
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
+msgid "Way Info"
+msgstr "Yol bİlgisis"
 
-msgid "Downloading Mapillary images"
-msgstr ""
+msgid "Speed"
+msgstr "Hız"
 
-msgid "Total Mapillary images: {0}"
-msgstr ""
+msgid "Course"
+msgstr "Yön"
 
-msgid "Submitting Mapillary Changeset"
-msgstr ""
+msgid "LiveGPS layer"
+msgstr "Canlı GPS tabakası"
 
-msgid "No images found"
-msgstr ""
+msgid "Capture GPS Track"
+msgstr "GPS izini takip et"
 
-msgid "Finished upload"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
+"gpsd server ına bağlan ve şu anki pozsiyonu CanlıGPS tabakasında göster"
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
+msgid "Center Once"
+msgstr "Merkeze koy"
 
-msgid "Not Logged in to Mapillary"
-msgstr ""
+msgid "Center the LiveGPS layer to current position."
+msgstr "Canlı GPS verilerini tabakadfa merkeze koy."
 
-msgid "Uploading: {0}"
-msgstr ""
+msgid "Auto-Center"
+msgstr "Otomatik-Merkezleme"
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr "Devamlı olarak canlı GPS tabakasını görüntünün ortasına getir"
+
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29746,6 +29888,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "taşındı"
+
 msgid "rail"
 msgstr "demiryolu"
 
@@ -29841,9 +29986,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr "taşındı"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30855,6 +30997,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31302,6 +31504,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "İleri"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "Geri"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32126,9 +32406,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "Geometriyi değiştir"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32322,15 +32599,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr "Geri"
-
 msgid "jumps n sec back"
 msgstr "n saniye geriye git"
 
-msgid "Forward"
-msgstr "İleri"
-
 msgid "jumps n sec forward"
 msgstr "n saniye ileriye git"
 
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 4c8fd17..8f251de 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:38+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:12+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index 2ee4228..a9000f9 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-09-05 18:39+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-11-03 18:10+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:39+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:12+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: uk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -222,18 +222,6 @@ msgstr "Виділити на мапі об’єкти, вибрані у спи
 msgid "Add imagery layer {0}"
 msgstr "Додати шар з зображенням {0}"
 
-msgid "Error"
-msgstr "Помилка"
-
-msgid "Select image format for WMS layer"
-msgstr "Оберіть формат зображення для шару WMS"
-
-msgid "Select WMS layers"
-msgstr "Оберіть шари WMS"
-
-msgid "Add layers"
-msgstr "Додати шари"
-
 msgid "Invalid service URL."
 msgstr "Помилкове сервісне посилання."
 
@@ -246,6 +234,18 @@ msgstr "Неможливо отримати перелік шарів WMS."
 msgid "Could not parse WMS layer list."
 msgstr "Неможливо здійснити розбір переліку шарів WMS."
 
+msgid "Error"
+msgstr "Помилка"
+
+msgid "Select image format for WMS layer"
+msgstr "Оберіть формат зображення для шару WMS"
+
+msgid "Select WMS layers"
+msgstr "Оберіть шари WMS"
+
+msgid "Add layers"
+msgstr "Додати шари"
+
 msgid "Add Node..."
 msgstr "Додати точку…"
 
@@ -500,7 +500,7 @@ msgid "Download notes in current view"
 msgstr "Завантажити нотатки для поточного виду"
 
 msgid "Download in current view"
-msgstr "Завантажити до поточного місця"
+msgstr "Завантажити поточне місце"
 
 msgid "Download map data from the OSM server in current view"
 msgstr "Завантажити дані з сервера OSM для поточного виду"
@@ -3631,9 +3631,6 @@ msgstr "Ідентифікатор набору матриць"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Не визначено жодного шару через getCapabilities докменту: {0}"
 
-msgid "No layer selected"
-msgstr "Не виділено жодного шару"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -4068,12 +4065,12 @@ msgstr "Кілька зв’язків associatedStreet"
 msgid "House number without street"
 msgstr "Номер будинку без зазначення вулиці"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Дублювання номеру будинку ''{0}''"
-
 msgid "Duplicate house numbers"
 msgstr "Дублікати номерів будинків"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Дублювання номеру будинку ''{0}''"
+
 msgid "Multiple street names in relation"
 msgstr "Частини вулиці у зв’язку мають різні назви"
 
@@ -4111,6 +4108,9 @@ msgstr "Берегова лінія"
 msgid "This test checks that coastlines are correct."
 msgstr "Цей тест перевіряє, що берегові лінії є правильними."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "Зворотня берегова лінія: земля не ліворуч"
+
 msgid "Unconnected coastline"
 msgstr "Роз’єднані берегові лінії"
 
@@ -4120,6 +4120,9 @@ msgstr "Невпорядкована берегова лінія"
 msgid "Reversed coastline"
 msgstr "Зворотня берегова лінія"
 
+msgid "invalid coastline"
+msgstr "Помилки берегової лінії"
+
 msgid "Conditional Keys"
 msgstr "Умовні ключі"
 
@@ -4156,6 +4159,12 @@ msgstr "Перетин кордонів"
 msgid "Crossing barriers"
 msgstr "Перетин огорож (бар’єрів)"
 
+msgid "Self crossing"
+msgstr "Самоперетин"
+
+msgid "Self-crossing ways"
+msgstr "Шляхи, що перетинають себе"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4390,6 +4399,12 @@ msgstr "Непридатна роль члена мультиполігону"
 msgid "Non-Way in multipolygon"
 msgstr "Не-лінія в мультиполігоні"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr "Член(и) звʼязку, що мають кілька ролей"
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr "Член(и) звʼязку, що повторюються з однією роллю"
+
 msgid "Missing name:* translation"
 msgstr "Відсутній переклад name:*"
 
@@ -4613,30 +4628,30 @@ msgstr "Значення містить кілька пробілів поспі
 msgid "Property values contain HTML entity"
 msgstr "Значення містять елементи HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Ключ ''{0}'' схожий на ''{1}''."
-
 msgid "Misspelled property key"
 msgstr "Опечатка в ключі властивостей"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Ключа ''{0}'' немає в заготовках."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "Ключ ''{0}'' схожий на ''{1}''."
 
 msgid "Presets do not contain property key"
 msgstr "Заготовки не містять такого ключа"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Значення ''{0}'' ключа ''{1}'' схоже на ''{2}''."
+msgid "Key ''{0}'' not in presets."
+msgstr "Ключа ''{0}'' немає в заготовках."
 
 msgid "Misspelled property value"
 msgstr "Опечатка в значенні"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Значення ''{0}'' для ключа ''{1}'' немає в заготовках"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "Значення ''{0}'' ключа ''{1}'' схоже на ''{2}''."
 
 msgid "Presets do not contain property value"
 msgstr "Заготовки не мають такого значення"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Значення ''{0}'' для ключа ''{1}'' немає в заготовках"
+
 msgid "FIXMES"
 msgstr "ПОТРІБНО ВИПРАВИТИ"
 
@@ -4888,9 +4903,6 @@ msgstr "Помилково впорядковані лінії"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Цей тест перевіряє напрямок водних та берегових ліній."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "Зворотня берегова лінія: земля не ліворуч"
-
 msgid "Reversed land: land not on left side"
 msgstr "Зворотня лінія суші: земля не ліворуч"
 
@@ -5456,9 +5468,6 @@ msgstr "Географічна довгота під вказівником ми
 msgid "System of measurement changed to {0}"
 msgstr "Систему вимірювання змінено на {0}"
 
-msgid "Layer not in list."
-msgstr "Шару немає в списку."
-
 msgid "Default (open, closed, new)"
 msgstr "Типово (відкриті, закриті, нові)"
 
@@ -7023,6 +7032,9 @@ msgstr "Сортувати нотатки"
 msgid "Sort"
 msgstr "Впорядкувати"
 
+msgid "Open the note in an external browser"
+msgstr "Відкрити нотатку в оглядачі"
+
 msgid "Object type:"
 msgstr "Тип об’єкту:"
 
@@ -7273,6 +7285,14 @@ msgstr "Завантажити з сервера вміст набору змі
 msgid "Download the content of the selected changesets from the server"
 msgstr "Завантажити з сервера вміст виділених наборів змін"
 
+msgid "Download changed objects"
+msgstr "Завантажити змінені обʼєкти"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr "Завантажити поточну версію змінених обʼєктів у вибраних наборах змін"
+
 msgid "My changesets"
 msgstr "Мої набори змін"
 
@@ -8671,9 +8691,6 @@ msgstr "Введіть назву місця для пошуку"
 msgid "Areas around places"
 msgstr "Ділянки біля місця"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Виключення ''порожній покажчик'' — можливо, є відсутні теґи"
-
 msgid "Search ..."
 msgstr "Пошук…"
 
@@ -9325,6 +9342,9 @@ msgstr ""
 "Незбережені зміни — Зберегти локально або надіслати на сервер перед "
 "вилученням?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "Незбережені зміни – Зберегти/Надіслати перед перезапуском?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Надсилання на сервер та збереження змінених шарів…"
 
@@ -9400,6 +9420,13 @@ msgstr "Вийти зараз!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Вийти з JOSM без збереження. Незбережені зміни будуть втрачені."
 
+msgid "Restart now!"
+msgstr "Перезапустити зараз!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+"Перезапустити JOSM без збереження. Незбережені зміни будуть втрачені."
+
 msgid "Delete now!"
 msgstr "Вилучити зараз!"
 
@@ -9414,6 +9441,14 @@ msgstr ""
 "Вихід з JOSM з збереженням. Незбережені зміни будуть збережені локально або "
 "завантажені на сервер."
 
+msgid "Perform actions before restarting"
+msgstr "Виконати дію перед перезапуском"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+"Перезапустити JOSM зі збереженням. Незбережені обʼєкти будуть надіслані до "
+"сервера та/або збережені."
+
 msgid "Perform actions before deleting"
 msgstr "Виконати дію перед вилученням"
 
@@ -11741,6 +11776,9 @@ msgstr "Стрілки для одностороннього руху."
 msgid "Draw segment order numbers"
 msgstr "Показувати порядкові номери відрізків"
 
+msgid "Draw segment order numbers on selected way"
+msgstr "Показувати порядкові номери відрізків у виділеній лінії"
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Показувати межі завантажених даних"
 
@@ -14033,6 +14071,9 @@ msgstr "Успішний імпорт NMEA:"
 msgid "NMEA import failure!"
 msgstr "Збій при імпорті NMEA!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Виключення ''порожній покажчик'' — можливо, є відсутні теґи"
+
 msgid "Note Files"
 msgstr "Файли Нотаток"
 
@@ -14435,6 +14476,9 @@ msgstr "Надсилання даних…"
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Знайдено неочікуваний ідентифікатор 0 для елемента OSM"
 
+msgid "Failed to evaluate {0}"
+msgstr "Неможливо виконати {0}"
+
 msgid "Downloading data..."
 msgstr "Звантаження даних…"
 
@@ -16386,6 +16430,9 @@ msgstr "Тирис: DGM (Модель ґрунтів)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Тирис: DGM (Модель поверхні)"
 
+msgid "Tiris: contour lines"
+msgstr "Tiris: лінії висот"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Відень: Багатоцільова мапа (загального призначення)"
 
@@ -16497,8 +16544,11 @@ msgstr "Geodatastyrelsen кадастрові ділянки INSPIRE"
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr "Геодані агентство DTK Kort25"
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
-msgstr "Агентство геоданих Skyggekort 1.6 м"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr "SDFE мапа рельєфу (40 см)"
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
+msgstr "SDFE мапа поверхні (40 см)"
 
 msgid "Geodatastyrelsen Skærmkort"
 msgstr "Геодані агентство Skærmkort"
@@ -16676,6 +16726,9 @@ msgstr "Знімки з дрону 2014 (Гаїті)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Знімки з дронів Canaan(Гаіті) Листопад 2015"
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr "Matthew (Гаїті) - знімки з дрона, жовтень 2016"
+
 msgid "FÖMI ortophoto 2000"
 msgstr "FÖMI ортофото 2000"
 
@@ -16971,18 +17024,6 @@ msgstr "Freemap.sk Велосипедна"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Лижна"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Кадастрова мапа Словаччини (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Кадастрова мапа Словаччини (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Словаччина EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Словаччина EEA CORINE 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Словаччина: історичні мапи"
 
@@ -16992,6 +17033,9 @@ msgstr "RABA-KGZ: Словенія - використання сільгоспз
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "RABA-KGZ: Словенія - територія забудови"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr "Кейптаун, аерофото 2015"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Південна Африка CD:NGI Aerial"
 
@@ -17125,6 +17169,9 @@ msgstr "Дороги лісової служби США"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Україна - ортофотоплани 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Україна - Київ 2014 (ДЗК)"
+
 msgid "7th Series (OS7)"
 msgstr "7-я серія (OS7)"
 
@@ -17526,6 +17573,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "Завантаження даних OSM вздовж лінії"
 
+msgid "Dxf Import"
+msgstr "Імпорт dxf"
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17674,6 +17724,9 @@ msgstr ""
 "створює орграф та перевіряє підмножини каналів на те, чи є вони розв’язками, "
 "або шукає у підмножинах каналів розв’язки"
 
+msgid "Tools to help import Kartverket N50"
+msgstr "Інструменти, які допомагають під час імпорту Kartverket N50"
+
 msgid "Helps vectorizing WMS images."
 msgstr "Допомагає оцифровувати (векторизувати) зображення WMS."
 
@@ -17925,6 +17978,13 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Зробити ряд будинків по вулиці з одного блоку."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+"Додає діалог переліку завдань, що дозволяє спростити обробку великих обсягів "
+"обʼєктів"
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17956,6 +18016,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Втулок для накладення цифрового підпису на дані OSM"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr "Редактор для додавання теґів turn:lanes до доріг"
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -18125,6 +18188,10 @@ msgid "No wheeled vehicle"
 msgstr "Проїзд колісного транспорту неможливий"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr "верхова їзда"
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "поле"
 
@@ -19454,6 +19521,9 @@ msgstr "будується"
 msgid "Ford"
 msgstr "Брід"
 
+msgid "stepping_stones"
+msgstr "перехід по камінню"
+
 msgid "Ways"
 msgstr "Шляхи"
 
@@ -21092,6 +21162,9 @@ msgstr "Злітно-посадкова смуга"
 msgid "Taxiway"
 msgstr "Руліжна доріжка"
 
+msgid "Holding Position"
+msgstr "Місце зупинки перед ВПС"
+
 msgid "Helipad"
 msgstr "Вертолітний майданчик"
 
@@ -21762,11 +21835,11 @@ msgstr "Номер пункту"
 msgid "Point Name"
 msgstr "Назва пункту"
 
-msgid "Phone Number"
-msgstr "Номер телефону"
+msgid "Emergency Phone Number"
+msgstr "Телефон швидкої допомоги"
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Використовуйте міжнародний код, наприклад: +38-044-1030000)"
+msgid "(Use number as shown on plate.)"
+msgstr "(Номер, так як він записаний на плашці)"
 
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -21780,6 +21853,12 @@ msgstr "Станція швидкої допомоги"
 msgid "Automated Defibrillator"
 msgstr "Автоматизований дефібрилятор"
 
+msgid "Location description"
+msgstr "Опис місця знаходження"
+
+msgid "Phone Number"
+msgstr "Номер телефону"
+
 msgid "Located inside a building?"
 msgstr "Розташований у будівлі?"
 
@@ -22649,6 +22728,10 @@ msgid "university"
 msgstr "університет"
 
 msgctxt "building"
+msgid "college"
+msgstr "коледж"
+
+msgctxt "building"
 msgid "hospital"
 msgstr "лікарня"
 
@@ -22733,6 +22816,10 @@ msgid "public"
 msgstr "суспільне"
 
 msgctxt "building"
+msgid "ruins"
+msgstr "руїни"
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Поверхи"
 
@@ -24949,8 +25036,14 @@ msgstr "Заповідник"
 msgid "Scree"
 msgstr "Осип"
 
-msgid "An accumulation of loose rocks."
-msgstr "Накопичення осадових порід"
+msgid "An accumulation of loose angular rocks."
+msgstr "Скупчення кутастих каменів та уламків гірських порід."
+
+msgid "Shingle"
+msgstr "Галька"
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr "Скупчення заокруглених каменів на пляжі або березі річки."
 
 msgid "Fell"
 msgstr "Кам’яниста земля"
@@ -25632,17 +25725,11 @@ msgstr "Маршрути"
 msgid "Bicycle Route"
 msgstr "Веломаршрут"
 
-msgid "icn"
-msgstr "icn"
+msgid "national"
+msgstr "національна"
 
-msgid "ncn"
-msgstr "ncn"
-
-msgid "rcn"
-msgstr "rcn"
-
-msgid "lcn"
-msgstr "lcn"
+msgid "local"
+msgstr "місцева"
 
 msgid "Mountain Biking Route"
 msgstr "Гірський веломаршрут"
@@ -25650,18 +25737,6 @@ msgstr "Гірський веломаршрут"
 msgid "Hiking Route"
 msgstr "Пішохідний туристичний маршрут"
 
-msgid "iwn"
-msgstr "iwn"
-
-msgid "nwn"
-msgstr "nwn"
-
-msgid "rwn"
-msgstr "rwn"
-
-msgid "lwn"
-msgstr "lwn"
-
 msgid "infrastructure"
 msgstr "інфраструктура"
 
@@ -25674,18 +25749,6 @@ msgstr "Пішохідний маршрут"
 msgid "Riding Route"
 msgstr "Кінний маршрут"
 
-msgid "ihn"
-msgstr "міжнародна (ihn)"
-
-msgid "nhn"
-msgstr "національна (nhn)"
-
-msgid "rhn"
-msgstr "регіональна (rhn)"
-
-msgid "lhn"
-msgstr "місцева (lhn)"
-
 msgid "Piste Route"
 msgstr "Лижня"
 
@@ -25878,9 +25941,21 @@ msgstr "Непарний номер будинку в інтерполяції 
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr "Лінія з {0}. За можливості позначте адресу кожного будинку окремо."
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+"Обʼєкт не має {0}, проте, він має {1} та {2} що виглядають як номер будинку."
+
+msgid "Same value of {0} and {1}"
+msgstr "Те ж саме значення {0} і {1}"
+
 msgid "{0} without {1}"
 msgstr "{0} без {1}"
 
+msgid "missing tag"
+msgstr "відсутній теґ"
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} без {1} чи {2}"
 
@@ -25890,6 +25965,12 @@ msgstr "{0} без {1}, {2} або {3}"
 msgid "{0} together with {1}"
 msgstr "{0} разом з {1}"
 
+msgid "suspicious tag combination"
+msgstr "підозріла комбінація теґів"
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr "два обʼєкти, один з {0} та інший з {1} + {2} + {3}"
+
 msgid "incomplete object: only {0}"
 msgstr "неповний об’єкт: тільки {0}"
 
@@ -25905,39 +25986,24 @@ msgstr "{0} разом з {1} та суперечливими значенням
 msgid "{0} on suspicious object"
 msgstr "{0} на сумнівному об’єкті"
 
-msgid "restaurant without name"
-msgstr "ресторан без назви"
-
-msgid "{0} used with {1}"
-msgstr "{0} використаний разом з {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "natural=water у плавальних басейнах"
 
 msgid "sport without physical feature"
 msgstr "теґ sport без фізичного об’єкта"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} повинен бути точкою перетину {1} ​​і {2}"
-
 msgid "alternative name without {0}"
 msgstr "альтернативна назва без {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "неповне використання {0} на лінії без {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr "Те ж саме значення {0} і {1}"
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr "Те ж саме значення {0}, {1} і {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr "{0} і {1} разом з {2} і значеннями, що спричиняють конфлікт"
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr "Підозріла комбінація тегів: {0} і {1}"
-
 msgid "{0} on a relation without {1}"
 msgstr "{0} на звʼязку без {1}"
 
@@ -25962,9 +26028,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr "{0} разом з {1} та {2}. Вилучіть {1} та {2}"
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr "Різна кількість смуг для ругу в ключах {0} та {1}"
+
+msgid "possibly missing {0} tag"
+msgstr "можливо, пропущено теґ {0}"
+
 msgid "{0} is deprecated"
 msgstr "{0} заборонено"
 
+msgid "deprecated tagging"
+msgstr "небажане (застаріле) теґування"
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "''{0}'' не має сенсу, використовуйте більш конкретні теґи, наприклад ''{1}''"
@@ -26036,12 +26111,18 @@ msgstr "Незрозумілий теґ {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Визначення {0} є неточним"
 
+msgid "{0} + {1} + {2}"
+msgstr "{0} + {1} + {2}"
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 "{0} не рекомендується. Скористайтесь пунктом «Змініти напрямок» з меню "
 "«Інструменти»."
 
+msgid "{0}"
+msgstr "{0}"
+
 msgid "key with uncommon character"
 msgstr "Ключ з незвичайним символом"
 
@@ -26058,8 +26139,8 @@ msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 "{0} є застрілим. Використовуйте {1}: префікс для ключа замість цього."
 
-msgid "questionable key (ending with a number): {0}"
-msgstr "сумнівний ключ (закінчується числом): {0}"
+msgid "questionable key (ending with a number)"
+msgstr "сумнівний ключ (з цифрою в кінці)"
 
 msgid "The key {0} has an uncommon value."
 msgstr "Ключ {0} має дивне значення."
@@ -26103,8 +26184,8 @@ msgstr "Перекриття ідентичних природних ділян
 msgid "Overlapping Identical Landuses"
 msgstr "Перекриття ідентичних ділянок землекористування"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} має бути приєднаним до лінії"
+msgid "isolated node which must be connected to a way"
+msgstr "відокремлена точка, що повинна бути приєднана до лінії"
 
 msgid "node connects waterway and bridge"
 msgstr "точка є спільною для мосту та водного шляху"
@@ -26141,6 +26222,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr "Берегова лінія в середині {1}"
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} повинен бути точкою перетину {1} ​​і {2}"
+
 msgid "abbreviated street name"
 msgstr "скорочене позначення вулиці"
 
@@ -26159,6 +26243,9 @@ msgstr "Дороги без номера (ref)"
 msgid "temporary highway type"
 msgstr "дороги із тимчасовим типом (road)"
 
+msgid "{0} used with {1}"
+msgstr "{0} використаний разом з {1}"
+
 msgid "street name contains ss"
 msgstr "назва вулиці містить ss"
 
@@ -26259,11 +26346,14 @@ msgstr "невідоме іудейське віросповідання"
 msgid "{0} is unnecessary"
 msgstr "{0} є непотрібним"
 
+msgid "unnecessary tag"
+msgstr "непотрібний теґ"
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} є непотрібним для {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} не має сенсу"
+msgid "{0} makes no sense"
+msgstr "{0} не має сенсу"
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Точки дублюють теґи батьківської лінії"
@@ -26524,6 +26614,27 @@ msgstr "Надсилання GPX-треку на сервер"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Надсилання треків на сайт openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Імпортується…"
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr "Файли DXF [втулок ImportDxf] (*.dxf)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Будь ласка, створіть чи відкрийте шар з даними перед імпортом"
+
+msgid "Import dxf"
+msgstr "Імпорт dxf"
+
+msgid "Scale:"
+msgstr "Масштаб:"
+
+msgid "unit(s) = "
+msgstr "одиниці = "
+
+msgid "m"
+msgstr "м"
+
 msgid "Shows elevation profile"
 msgstr "Показує профілі висоти"
 
@@ -26881,6 +26992,411 @@ msgstr "Імпортувати зображення, прив’язане до
 msgid "Error while creating image layer: "
 msgstr "Під час створення шару зображення сталась помилка: "
 
+msgid "Mapillary Images"
+msgstr "Знімки Mapillary"
+
+msgid "Mapillary layer"
+msgstr "Mapillary"
+
+msgid "Total images:"
+msgstr "Всього знімків:"
+
+msgid "images"
+msgstr "знімків"
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr "Символ ''{0}'' шрифту з дорожніми знаками має помилковий формат"
+
+msgid "Could not read font-file from ''{0}''"
+msgstr "Неможливо прочитати файл шрифту з ''{0}''"
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr "Створити шар Mapillary"
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr "Виберіть знімки"
+
+msgid "Import pictures into sequence"
+msgstr "Імпорт зображень з послідовності"
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr "Імпорт зображень в шар Mapillary з послідовності"
+
+msgid "Join mode"
+msgstr "Режим з’єднування"
+
+msgid "Join/unjoin pictures"
+msgstr "З’єднати/роз’єднати зображення"
+
+msgid "Join Mapillary pictures"
+msgstr "З’єднати зображення Mapillary"
+
+msgid "Submit changeset"
+msgstr "Надіслати набір змін"
+
+msgid "Submit the current changeset"
+msgstr "Надіслати поточний набір змін"
+
+msgid "Submit the current changeset to Mapillary"
+msgstr "Надіслати поточний набір змін до Mapillary"
+
+msgid "Upload pictures"
+msgstr "Завантажити знімки"
+
+msgid "Upload Mapillary pictures"
+msgstr "Завантажити знімки Mapillary"
+
+msgid "Upload pictures."
+msgstr "Завантажити знімки."
+
+msgid "Walk mode"
+msgstr "Пішохідний режим"
+
+msgid "Start walk mode"
+msgstr "Запустити пішохідний режим"
+
+msgid "Zoom to selected image"
+msgstr "Масштабувати до виділеного знімка"
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr "Масштабувати до поточного виділеного знімка Mapillary"
+
+msgid "View in website"
+msgstr "Подивитись на сайті"
+
+msgid "Copy key"
+msgstr "Копіювати ключ"
+
+msgid "Copy key tag"
+msgstr "Копіювати теґ"
+
+msgid "Edit on website"
+msgstr "Редагувати на сайті"
+
+msgid "Current Mapillary changeset"
+msgstr "Поточний набір змін Mapillary"
+
+msgid "Open Mapillary changeset dialog"
+msgstr "Відкрити діалог набору змін Mapillary"
+
+msgid "Mapillary changeset"
+msgstr "Набір змін Mapillary"
+
+msgid "Submit"
+msgstr "Надіслати"
+
+msgid "Export all images"
+msgstr "Експортувати всі знімки"
+
+msgid "Export selected sequence"
+msgstr "Експортувати обрану послідовність"
+
+msgid "Export selected images"
+msgstr "Експортувати виділені знімки"
+
+msgid "Rewrite imported images"
+msgstr "Перезаписати імпортовані зображення"
+
+msgid "Select a folder"
+msgstr "Оберіть теку"
+
+msgid "Explore"
+msgstr "Оглянути"
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr "Знімок Mapillary"
+
+msgid "Open Mapillary window"
+msgstr "Відкрити вікно Mapillary"
+
+msgid "Mapillary dialog"
+msgstr "Mapillary"
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr "Увійти"
+
+msgid "Logout"
+msgstr "Вихід"
+
+msgid "Download mode"
+msgstr "Режим завантаження"
+
+msgid "You are logged in as ''{0}''."
+msgstr "Ви увійшли як  ''{0}''."
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr "все, що є у видимій області"
+
+msgid "areas with downloaded OSM-data"
+msgstr "області із завантаженими даними OSM"
+
+msgid "only when manually requested"
+msgstr "тільки під час отримання запиту вручну"
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+msgstr ""
+"Завантажена ділянка з даними OSM завелика. Режим завантаження змінено до "
+"ділянки даних з OSM до наступного перезапуску шару."
+
+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 "The image key ''{0}'' is invalid!"
+msgstr "Ключ зображення ''{0}'' - недійсний!"
+
+msgid "The image key must not be null here!"
+msgstr "Ключ зображення не повинен бути null!"
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr "Ключ послідовності ''{0}'' - помилковий!"
+
+msgid "The sequence key must not be null here!"
+msgstr "Ключ послідовності не повинен дорівнювати null!"
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28745,9 +29261,6 @@ msgstr "Відкрити панель ГеоЧату"
 msgid "Zoom in to see messages"
 msgstr "Наблизитись, щоб побачити повідомлення"
 
-msgid "Login"
-msgstr "Увійти"
-
 msgid "Enable autologin"
 msgstr "Входити автоматично"
 
@@ -28781,9 +29294,6 @@ msgstr "Приватний чат"
 msgid "Close tab"
 msgstr "Закрити вкладку"
 
-msgid "Logout"
-msgstr "Вихід"
-
 msgid "Clear log"
 msgstr "Очистити журнал"
 
@@ -29360,9 +29870,6 @@ msgstr "мм"
 msgid "cm"
 msgstr "см"
 
-msgid "m"
-msgstr "м"
-
 msgid "km"
 msgstr "км"
 
@@ -29548,21 +30055,9 @@ msgstr "Імпортовані зображення"
 msgid "Import vector graphics"
 msgstr "Імпорт векторної графіки"
 
-msgid "Scale:"
-msgstr "Масштаб:"
-
-msgid "unit(s) = "
-msgstr "одиниці = "
-
-msgid "Importing..."
-msgstr "Імпортується…"
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "Файли SVG [втулок ImportVec] (*.svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Будь ласка, створіть чи відкрийте шар з даними перед імпортом"
-
 msgid "Concourse wizard ..."
 msgstr "Майстер вестибюлів …"
 
@@ -29778,6 +30273,65 @@ msgstr "Кількість {0}-лінійних перехрещень: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "згенерувати усі варіанти в’їзду/виїзду з/на розв’язку"
 
+msgid "Check the direction"
+msgstr "Перевірте напрямок"
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+"Перевірте напрямок виділеного струмка/ріки. Він є вірним?\n"
+" Виконано: "
+
+msgid "Correct"
+msgstr "Вірно"
+
+msgid "Wrong"
+msgstr "Не вірно"
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr "<HTML><U>В</U>вірний напрямок</HTML>"
+
+msgid "Direction of river is correct."
+msgstr "Напрямок течії ріки вказано вірно."
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr "<HTML><U>Н</U>е вірний напрямок</HTML>"
+
+msgid "Direction of river is wrong."
+msgstr "Напрямок течії ріки вказано не вірно."
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr "<HTML><U>І</U>гнорувати цю лінію</HTML>"
+
+msgid "Ignore direction of this way."
+msgstr "Не зважати на напрямок цієї лінії."
+
+msgid "Check direction of streams"
+msgstr "Перевірити напрямок течії струмків"
+
+msgid "Check direction of streams and rivers"
+msgstr "Перевірити напрямок течії струмків та рік"
+
+msgid "No more directions to check!"
+msgstr "Обʼєкти для перевірки відсутні!"
+
+msgid "Replace way"
+msgstr "Замінити лінію"
+
+msgid "Replace way of selected way with a new way"
+msgstr "Замінити виділену лінію новою"
+
+msgid "Replace Geometry"
+msgstr "Замінити геометрію"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+"Цей інструмент заміняє берегову лінію на лінію з новою геометрією, для цього "
+"потрібно виділити обидві лінії."
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Індекс напрямку ''{0}'' не знайдений"
 
@@ -30039,408 +30593,6 @@ msgstr "Активує втулок звітування про помилки M
 msgid "Missing input data"
 msgstr "Вхідні дані відсутні"
 
-msgid "Mapillary Images"
-msgstr "Знімки Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Mapillary"
-
-msgid "Total images:"
-msgstr "Всього знімків:"
-
-msgid "images"
-msgstr "знімків"
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr "Символ ''{0}'' шрифту з дорожніми знаками має помилковий формат"
-
-msgid "Could not read font-file from ''{0}''"
-msgstr "Неможливо прочитати файл шрифту з ''{0}''"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr "Створити шар Mapillary"
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr "Виберіть знімки"
-
-msgid "Import pictures into sequence"
-msgstr "Імпорт зображень з послідовності"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Імпорт зображень в шар Mapillary з послідовності"
-
-msgid "Join mode"
-msgstr "Режим з’єднування"
-
-msgid "Join/unjoin pictures"
-msgstr "З’єднати/роз’єднати зображення"
-
-msgid "Join Mapillary pictures"
-msgstr "З’єднати зображення Mapillary"
-
-msgid "Submit changeset"
-msgstr "Надіслати набір змін"
-
-msgid "Submit the current changeset"
-msgstr "Надіслати поточний набір змін"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Надіслати поточний набір змін до Mapillary"
-
-msgid "Upload pictures"
-msgstr "Завантажити знімки"
-
-msgid "Upload Mapillary pictures"
-msgstr "Завантажити знімки Mapillary"
-
-msgid "Upload pictures."
-msgstr "Завантажити знімки."
-
-msgid "Walk mode"
-msgstr "Пішохідний режим"
-
-msgid "Start walk mode"
-msgstr "Запустити пішохідний режим"
-
-msgid "Zoom to selected image"
-msgstr "Масштабувати до виділеного знімка"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Масштабувати до поточного виділеного знімка Mapillary"
-
-msgid "Uploaded {0} images"
-msgstr "Надіслано {0} знімків"
-
-msgid "Approve upload on the website"
-msgstr "Підтверджувати надсилання до веб-сайту"
-
-msgid "View in website"
-msgstr "Подивитись на сайті"
-
-msgid "Copy key"
-msgstr "Копіювати ключ"
-
-msgid "Copy key tag"
-msgstr "Копіювати теґ"
-
-msgid "Edit on website"
-msgstr "Редагувати на сайті"
-
-msgid "Current Mapillary changeset"
-msgstr "Поточний набір змін Mapillary"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Відкрити діалог набору змін Mapillary"
-
-msgid "Mapillary changeset"
-msgstr "Набір змін Mapillary"
-
-msgid "Submit"
-msgstr "Надіслати"
-
-msgid "Export all images"
-msgstr "Експортувати всі знімки"
-
-msgid "Export selected sequence"
-msgstr "Експортувати обрану послідовність"
-
-msgid "Export selected images"
-msgstr "Експортувати виділені знімки"
-
-msgid "Rewrite imported images"
-msgstr "Перезаписати імпортовані зображення"
-
-msgid "Select a folder"
-msgstr "Оберіть теку"
-
-msgid "Explore"
-msgstr "Оглянути"
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr "Знімок Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Відкрити вікно Mapillary"
-
-msgid "Mapillary dialog"
-msgstr "Mapillary"
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr "Режим завантаження"
-
-msgid "You are logged in as ''{0}''."
-msgstr "Ви увійшли як  ''{0}''."
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr "все, що є у видимій області"
-
-msgid "areas with downloaded OSM-data"
-msgstr "області із завантаженими даними OSM"
-
-msgid "only when manually requested"
-msgstr "тільки під час отримання запиту вручну"
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
-"Завантажена в JOSM ділянка завелика. Режим завантаження був змінений на "
-"напівавтоматичний до перезапуску шару."
-
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr "Ключ зображення ''{0}'' - недійсний!"
-
-msgid "The image key must not be null here!"
-msgstr "Ключ зображення не повинен бути null!"
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr "Ключ послідовності ''{0}'' - помилковий!"
-
-msgid "The sequence key must not be null here!"
-msgstr "Ключ послідовності не повинен дорівнювати null!"
-
 msgid "Measured values"
 msgstr "Результати вимірювання"
 
@@ -31999,6 +32151,9 @@ msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 "ГТ: Маршрут проходить по дорозі з одностороннім рухом в помилковому напрямку"
 
+msgid "moved"
+msgstr "пересунуто"
+
 msgid "rail"
 msgstr "рейка"
 
@@ -32096,9 +32251,6 @@ msgstr "Захопити"
 msgid "Join"
 msgstr "Приєднати"
 
-msgid "moved"
-msgstr "пересунуто"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Громадський транспорт: Приєднати зупинки GTFS"
 
@@ -32802,10 +32954,10 @@ msgid "Select a map object"
 msgstr "Виділіть об’єкт на мапі"
 
 msgid "Shape actions panel"
-msgstr ""
+msgstr "Панель дій з формами"
 
 msgid "Shape mode control panel"
-msgstr ""
+msgstr "Панель керування формами"
 
 msgid "Rotate Mode:"
 msgstr "Режим обертання:"
@@ -33154,6 +33306,71 @@ msgstr ""
 msgid "Terrace"
 msgstr "Ряд будинків по вулиці"
 
+msgid "Pass over element without marking it"
+msgstr "Пропустити елемент не позначаючи його"
+
+msgid "Mark element done"
+msgstr "Позначити, як оброблений"
+
+msgid "Todo list"
+msgstr "Перелік завдань"
+
+msgid "Open the todo list."
+msgstr "Відкрити перелік щавдань."
+
+msgid "Zoom to the selected item in the todo list."
+msgstr "Наблизитись до обраного елемента з переліку завдань"
+
+msgid "Select all Unmarked and Zoom"
+msgstr "Виділити всі необроблені та наблизитись"
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+"Виділити та наблизитись до всіх не позначених елементів з переліку завдань."
+
+msgid "Pass"
+msgstr "Пропустити"
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+"Перейти до наступного елементу в переліку завдань, залишивши поточний в "
+"переліку. ([)."
+
+msgid "Add the selected items to the todo list."
+msgstr "Додати виділені елементи до переліку завдань."
+
+msgid "Mark selected"
+msgstr "Позначити виділені"
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+"Позначити виділений (на мапі) елемент як оброблений в переліку завдань."
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr "Позначити виділений в переліку елементи як оброблений. (])."
+
+msgid "Mark all"
+msgstr "Позначити всі"
+
+msgid "Mark all items in the todo list as done."
+msgstr "Позначити всі елементи переліку як оброблені"
+
+msgid "Unmark all"
+msgstr "Зняти позначення з усіх"
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+"Скасувати позначення для всіх елементів, що були позначені як оброблені."
+
+msgid "Clear the todo list"
+msgstr "Очистити перелік завдань"
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr "Вилучити всі елементи (оброблені та необроблені) з переліку завдань"
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr "Перелік завдань {0}/{1} ({2}%)"
+
 msgid "To-fix"
 msgstr "To-fix"
 
@@ -33629,6 +33846,91 @@ msgstr "Виберіть дату закінчення строку дії кл
 msgid "Create a new signing key"
 msgstr "Створіть новий ключ для підписування"
 
+msgid "Turn lanes tagging - editor"
+msgstr "Turn lanes - редактор"
+
+msgid "Turn lanes tagging - Editor"
+msgstr "Turn lanes - Редактор"
+
+msgid "turn lanes tagging - editor"
+msgstr "turn lanes - редактор"
+
+msgid "Turn Lanes Editor"
+msgstr "Turn Lanes Редактор"
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+" Значення lane змінене відповідно до кількості вказаних смуг для руху"
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+" Значення lanes:forward змінене відповідно до кількості вказаних смуг для "
+"руху"
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+" Значення lanes:both_ways змінене відповідно до кількості вказаних смуг для "
+"руху"
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+" Значення lanes:backward змінене відповідно до кількості вказаних смуг для "
+"руху"
+
+msgid "check the right direction of the way"
+msgstr "перевірте напрямок лінії"
+
+msgid "Unidirectional road"
+msgstr "Односторонній рух"
+
+msgid "Build unidirectional road"
+msgstr "Створити дорогу з одностороннім рухом"
+
+msgid "Bidirectional road"
+msgstr "Двосторонній рух"
+
+msgid "Build bidirectional road"
+msgstr "Створити дорогу з двостороннім рухом"
+
+msgid "Use \"none\""
+msgstr "Використовувати \"none\""
+
+msgid "use \"none\" instead of empty values"
+msgstr "використовувати \"none\" замість пустого значення"
+
+msgid "Preset turn lanes"
+msgstr "Заготовки turn lanes"
+
+msgid "Recently turn lanes edits"
+msgstr "Нещодавні зміни turn lanes"
+
+msgid "Forward"
+msgstr "Вперед"
+
+msgid "Both way lane"
+msgstr "Реверс. смуга"
+
+msgid "Backward"
+msgstr "Назад"
+
+msgid "Number of backward lanes"
+msgstr "Кількість смуг backward"
+
+msgid "Number of forward lanes"
+msgstr "Кількість смуг forward"
+
+msgid "Both way"
+msgstr "Реверс.смуга"
+
+msgid "Number of lanes"
+msgstr "Кількість смуг"
+
+msgid "Directional"
+msgstr "Напрямок"
+
+msgid "Turn lanes"
+msgstr "Turn lanes (заготовки)"
+
 msgid "No such lane."
 msgstr "Така смуга відсутня"
 
@@ -34600,9 +34902,6 @@ msgstr "Знайти примітиви з цими теґами"
 msgid "Multitag Background: highlight"
 msgstr "Multitag Background: highlight"
 
-msgid "Replace Geometry"
-msgstr "Замінити геометрію"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Заміняє геометрію виділеного об’єкту на нову"
 
@@ -34816,15 +35115,9 @@ msgstr "починає/зупиняє відтворення відео"
 msgid "Video: {0}"
 msgstr "Відео: {0}"
 
-msgid "Backward"
-msgstr "Назад"
-
 msgid "jumps n sec back"
 msgstr "перемотати на n сек назад"
 
-msgid "Forward"
-msgstr "Вперед"
-
 msgid "jumps n sec forward"
 msgstr "перемотати на n сек вперед"
 
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index 99bd2f4..55184e0 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:40+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:13+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: ur\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -204,28 +204,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3278,9 +3278,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3682,10 +3679,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3722,6 +3719,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3731,6 +3731,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3767,6 +3770,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3985,6 +3994,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4195,30 +4210,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4462,9 +4477,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4985,9 +4997,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6407,6 +6416,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6646,6 +6658,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7918,9 +7938,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8484,6 +8501,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8535,6 +8555,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8547,6 +8573,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10600,6 +10632,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12681,6 +12716,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13043,6 +13081,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14686,6 +14727,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14797,7 +14841,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14976,6 +15023,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15270,18 +15320,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15291,6 +15329,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15423,6 +15464,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15790,6 +15834,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15904,6 +15951,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16101,6 +16151,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16123,6 +16178,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16279,6 +16337,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17599,6 +17661,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19218,6 +19283,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19888,10 +19956,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19906,6 +19974,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20775,6 +20849,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20859,6 +20937,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23064,7 +23146,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23731,16 +23819,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23749,18 +23831,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23773,18 +23843,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23977,9 +24035,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23989,6 +24058,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24004,39 +24079,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24055,9 +24115,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24112,10 +24181,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24131,7 +24206,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24176,7 +24251,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24210,6 +24285,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24228,6 +24306,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24318,10 +24399,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24567,6 +24651,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24905,3267 +25010,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29627,6 +29769,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29722,9 +29867,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30736,6 +30878,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31183,6 +31385,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32009,9 +32289,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32205,15 +32482,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index c6afe60..e79f34c 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:42+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:13+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: vi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -212,18 +212,6 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr "Add layer hình ảnh {0}"
 
-msgid "Error"
-msgstr "Lỗi"
-
-msgid "Select image format for WMS layer"
-msgstr "Chọn định dạng hình ảnh cho lớp WMS"
-
-msgid "Select WMS layers"
-msgstr "Chọn lớp WMS"
-
-msgid "Add layers"
-msgstr "Thêm lớp"
-
 msgid "Invalid service URL."
 msgstr "URL dịch vụ không hợp lệ."
 
@@ -236,6 +224,18 @@ msgstr "Không thể lấy danh sách lớp WMS."
 msgid "Could not parse WMS layer list."
 msgstr "Không thể phân tích danh sách lớp WMS."
 
+msgid "Error"
+msgstr "Lỗi"
+
+msgid "Select image format for WMS layer"
+msgstr "Chọn định dạng hình ảnh cho lớp WMS"
+
+msgid "Select WMS layers"
+msgstr "Chọn lớp WMS"
+
+msgid "Add layers"
+msgstr "Thêm lớp"
+
 msgid "Add Node..."
 msgstr "Add Node ..."
 
@@ -3485,9 +3485,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3919,12 +3916,12 @@ msgstr "Nhiều quan hệ associatedStreet"
 msgid "House number without street"
 msgstr "Số nhà mà không có đường phố"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "Nhà số '' {0} '' nhân đôi"
-
 msgid "Duplicate house numbers"
 msgstr "số nhà Duplicate"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "Nhà số '' {0} '' nhân đôi"
+
 msgid "Multiple street names in relation"
 msgstr "tên đường phố Nhiều trong mối quan hệ"
 
@@ -3959,6 +3956,9 @@ msgstr "Đường bờ biển"
 msgid "This test checks that coastlines are correct."
 msgstr "kiểm tra thử nghiệm này là đường bờ biển là chính xác."
 
+msgid "Reversed coastline: land not on left side"
+msgstr "đảo ngược bờ biển: đất không nằm về phía bên trái"
+
 msgid "Unconnected coastline"
 msgstr "bờ biển không có liên quan"
 
@@ -3968,6 +3968,9 @@ msgstr "bờ biển không có thứ tự"
 msgid "Reversed coastline"
 msgstr "đảo ngược bờ biển"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr "điều kiện Keys"
 
@@ -4004,6 +4007,12 @@ msgstr "ranh giới Crossing"
 msgid "Crossing barriers"
 msgstr "rào cản Crossing"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -4233,6 +4242,12 @@ msgstr "Không có vai trò hữu ích cho thành viên multipolygon"
 msgid "Non-Way in multipolygon"
 msgstr "Non-Way trong multipolygon"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "Thiếu tên: * Dịch thuật"
 
@@ -4457,30 +4472,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "giá trị tài sản có thực thể HTML"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
-msgstr "Key '' {0} '' không trong cài đặt trước."
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr "Presets không chứa key bất động sản"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr ""
+msgid "Key ''{0}'' not in presets."
+msgstr "Key '' {0} '' không trong cài đặt trước."
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Giá trị '' {0} '' cho khóa '' {1} '' không trong cài đặt trước."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr "Presets không chứa giá trị tài sản"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "Giá trị '' {0} '' cho khóa '' {1} '' không trong cài đặt trước."
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4731,9 +4746,6 @@ msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 "thử nghiệm này kiểm tra hướng của đường thủy, đường bộ và đường bờ biển."
 
-msgid "Reversed coastline: land not on left side"
-msgstr "đảo ngược bờ biển: đất không nằm về phía bên trái"
-
 msgid "Reversed land: land not on left side"
 msgstr "Reversed đất: đất không nằm về phía bên trái"
 
@@ -5277,9 +5289,6 @@ msgstr "kinh độ địa lý ở con trỏ chuột."
 msgid "System of measurement changed to {0}"
 msgstr "Hệ thống đo lường thay đổi để {0}"
 
-msgid "Layer not in list."
-msgstr "layer không có trong danh sách."
-
 msgid "Default (open, closed, new)"
 msgstr "Default (mở, đóng mới)"
 
@@ -6775,6 +6784,9 @@ msgstr "Sắp xếp các ghi chú"
 msgid "Sort"
 msgstr "Phân loại"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "kiểu Object:"
 
@@ -7020,6 +7032,14 @@ msgstr "Tải changeset nội dung"
 msgid "Download the content of the selected changesets from the server"
 msgstr "Tải về nội dung của các changesets được lựa chọn từ các máy chủ"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "changesets của tôi"
 
@@ -8397,9 +8417,6 @@ msgstr "Nhập tên địa điểm để tìm kiếm"
 msgid "Areas around places"
 msgstr "Khu vực xung quanh nơi"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer ngoại lệ, có thể một số thẻ mất tích."
-
 msgid "Search ..."
 msgstr "Tìm kiếm ..."
 
@@ -9035,6 +9052,9 @@ msgstr "thay đổi chưa được lưu - Lưu / Tải lên trước khi thoát?
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "thay đổi chưa được lưu - Lưu / Tải lên trước khi xóa?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "Tải lên và tiết kiệm đổi lớp ..."
 
@@ -9092,6 +9112,12 @@ msgstr "Thoát bây giờ!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Thoát JOSM mà không saving. thay đổi chưa được lưu sẽ bị mất."
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "Xóa ngay bây giờ!"
 
@@ -9106,6 +9132,12 @@ msgstr ""
 "Thoát JOSM với tiết kiệm. thay đổi chưa được lưu được tải lên và / hoặc lưu "
 "lại."
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "Thực hiện hành động trước khi xóa"
 
@@ -11345,6 +11377,9 @@ msgstr "Vẽ mũi tên oneway."
 msgid "Draw segment order numbers"
 msgstr "Vẽ số thứ tự phân đoạn"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "Vẽ ranh giới của dữ liệu tải về"
 
@@ -13600,6 +13635,9 @@ msgstr "nhập khẩu NMEA thành công:"
 msgid "NMEA import failure!"
 msgstr "nhập khẩu NMEA thất bại!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Null pointer ngoại lệ, có thể một số thẻ mất tích."
+
 msgid "Note Files"
 msgstr "Lưu ý Files"
 
@@ -13994,6 +14032,9 @@ msgstr "Tải lên dữ liệu ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Unexpected id 0 cho OSM nguyên thủy được tìm thấy"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "Tải dữ liệu ..."
 
@@ -15820,6 +15861,9 @@ msgstr "Tiris: DGM (Terrain model)"
 msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (mô hình bề mặt)"
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (mục đích chung)"
 
@@ -15931,7 +15975,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -16112,6 +16159,9 @@ msgstr "Drone Hình ảnh 2014 (Haiti)"
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -16406,18 +16456,6 @@ msgstr "Freemap.sk Cyclo"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk Ski"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna MAPA Slovenska (Kapor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna MAPA Slovenska (Kapor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA Corine 2006"
-
 msgid "Slovakia Historic Maps"
 msgstr "Slovakia Maps lịch sử"
 
@@ -16427,6 +16465,9 @@ msgstr "Raba-KGZ: Slovenia đất nông nghiệp sử dụng"
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr "Raba-KGZ: Slovenia xây dựng lên các khu vực"
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Nam Phi CD: NGI Aerial"
 
@@ -16559,6 +16600,9 @@ msgstr "Lâm nghiệp Hoa Kỳ con đường"
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr "Series 7 (OS7)"
 
@@ -16947,6 +16991,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr "tải dữ liệu OSM dọc theo một con đường"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -17087,6 +17134,9 @@ msgstr ""
 "mộtNgã ba hoặc tìm kiếm trong một tập hợp con của các kênh truyền hình cho "
 "nút giao thông"
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "Giúp vectorizing WMS hình ảnh."
 
@@ -17331,6 +17381,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "Hãy nhà bậc thang ra khỏi khối duy nhất."
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -17359,6 +17414,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin để dấu hiệu kỹ thuật số OSM-Data"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -17525,6 +17583,10 @@ msgid "No wheeled vehicle"
 msgstr "Không có chiếc xe bánh"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "pitch"
 
@@ -18853,6 +18915,9 @@ msgstr "xây dựng"
 msgid "Ford"
 msgstr "Ford"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "cách"
 
@@ -20490,6 +20555,9 @@ msgstr "Runway"
 msgid "Taxiway"
 msgstr "đường lăn"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "băng lên thẳng"
 
@@ -21162,11 +21230,11 @@ msgstr "điểm số"
 msgid "Point Name"
 msgstr "Điểm danh"
 
-msgid "Phone Number"
-msgstr "Số điện thoại"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Sử dụng mã quốc tế, như + 12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "thú y"
@@ -21180,6 +21248,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr "tự động khử rung tim"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "Số điện thoại"
+
 msgid "Located inside a building?"
 msgstr "Nằm trong một tòa nhà?"
 
@@ -22049,6 +22123,10 @@ msgid "university"
 msgstr "trường đại học"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "bệnh viện"
 
@@ -22133,6 +22211,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "Levels"
 
@@ -24347,8 +24429,14 @@ msgstr "Bảo tồn Thiên nhiên"
 msgid "Scree"
 msgstr "Scree"
 
-msgid "An accumulation of loose rocks."
-msgstr "Một sự tích lũy của các loại đá lỏng lẻo."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
+msgstr ""
 
 msgid "Fell"
 msgstr "Fell"
@@ -25030,17 +25118,11 @@ msgstr "đường"
 msgid "Bicycle Route"
 msgstr "Bicycle Route"
 
-msgid "icn"
-msgstr "ICN"
-
-msgid "ncn"
-msgstr "NCN"
-
-msgid "rcn"
-msgstr "RCN"
+msgid "national"
+msgstr ""
 
-msgid "lcn"
-msgstr "LCN"
+msgid "local"
+msgstr ""
 
 msgid "Mountain Biking Route"
 msgstr "Xe đạp leo núi Route"
@@ -25048,18 +25130,6 @@ msgstr "Xe đạp leo núi Route"
 msgid "Hiking Route"
 msgstr "Đường đi bộ Route"
 
-msgid "iwn"
-msgstr "iwn"
-
-msgid "nwn"
-msgstr "Neverwinter Nights"
-
-msgid "rwn"
-msgstr "rwn"
-
-msgid "lwn"
-msgstr "LWN"
-
 msgid "infrastructure"
 msgstr "cơ sở hạ tầng"
 
@@ -25072,18 +25142,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr "Piste Route"
 
@@ -25276,9 +25334,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr "{0} không có {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} không có {1} hoặc {2}"
 
@@ -25288,6 +25357,12 @@ msgstr "{0} không có {1}, {2} hoặc {3}"
 msgid "{0} together with {1}"
 msgstr "{0} cùng với {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "đối tượng không đầy đủ: chỉ {0}"
 
@@ -25303,39 +25378,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr "{0} vào đối tượng đáng ngờ"
 
-msgid "restaurant without name"
-msgstr "nhà hàng không tên"
-
-msgid "{0} used with {1}"
-msgstr "{0} được sử dụng với {1}"
-
 msgid "natural water used for swimming pool"
 msgstr "nước thiên nhiên dùng cho bể bơi"
 
 msgid "sport without physical feature"
 msgstr "thể thao mà không tính năng vật lý"
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} nên được trên nút nơi {1} và {2} giao nhau"
-
 msgid "alternative name without {0}"
 msgstr "tên thay thế mà không {0}"
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr "sử dụng không đầy đủ của {0} vào một cách mà không {1}"
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -25354,9 +25414,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} bị phản đối"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 "'' {0} '' là vô nghĩa, sử dụng các thẻ cụ thể hơn, ví dụ như '' {1} ''"
@@ -25423,10 +25492,16 @@ msgstr "tag không đặc hiệu {0}"
 msgid "Definition of {0} is unclear"
 msgstr "Định nghĩa của {0} là không rõ ràng"
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr "{0} là không nên. Sử dụng chức năng Xếp cách từ menu Tools."
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "chìa khóa với nhân vật hiếm"
 
@@ -25442,7 +25517,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -25487,8 +25562,8 @@ msgstr "Chồng chéo Khu vực tự nhiên giống hệt"
 msgid "Overlapping Identical Landuses"
 msgstr "Chồng chéo Landuses giống hệt"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} phải được kết nối một cách"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr "nút kết nối đường thủy và cầu nối"
@@ -25521,6 +25596,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr "{0} nên được trên nút nơi {1} và {2} giao nhau"
+
 msgid "abbreviated street name"
 msgstr "tên đường tắt"
 
@@ -25539,6 +25617,9 @@ msgstr "đường cao tốc mà không có một tài liệu tham khảo"
 msgid "temporary highway type"
 msgstr "đường cao tốc loại tạm thời"
 
+msgid "{0} used with {1}"
+msgstr "{0} được sử dụng với {1}"
+
 msgid "street name contains ss"
 msgstr "tên đường phố chứa ss"
 
@@ -25634,11 +25715,14 @@ msgstr "không rõ giáo phái Do Thái"
 msgid "{0} is unnecessary"
 msgstr "{0} là không cần thiết"
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr "{0} là không cần thiết cho {1}"
 
-msgid "{0}={1} makes no sense"
-msgstr "{0} = {1} làm cho không có ý nghĩa"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "Nodes nhân đôi cách mẹ tags"
@@ -25899,6 +25983,27 @@ msgstr "Uploading GPX Track"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Uploads dấu vết để openstreetmap.org"
 
+msgid "Importing..."
+msgstr "Nhập khẩu ..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr "Hãy mở hoặc tạo lớp dữ liệu trước khi nhập khẩu"
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "Scale:"
+
+msgid "unit(s) = "
+msgstr "đơn vị (s) = "
+
+msgid "m"
+msgstr "m"
+
 msgid "Shows elevation profile"
 msgstr "Hiển thị hồ sơ cao"
 
@@ -26252,6 +26357,403 @@ 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 "Total images:"
+msgstr ""
+
+msgid "images"
+msgstr ""
+
+msgid "Traffic sign font at ''{0}'' has wrong format"
+msgstr ""
+
+msgid "Could not read font-file from ''{0}''"
+msgstr ""
+
+msgid "Mapillary"
+msgstr "Mapillary"
+
+msgid "Create Mapillary layer"
+msgstr ""
+
+msgid "Start Mapillary layer"
+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 "Select pictures"
+msgstr ""
+
+msgid "Import pictures into sequence"
+msgstr ""
+
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
+
+msgid "Join mode"
+msgstr ""
+
+msgid "Join/unjoin pictures"
+msgstr ""
+
+msgid "Join Mapillary pictures"
+msgstr ""
+
+msgid "Submit changeset"
+msgstr ""
+
+msgid "Submit the current changeset"
+msgstr ""
+
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
+
+msgid "Upload pictures"
+msgstr ""
+
+msgid "Upload Mapillary pictures"
+msgstr ""
+
+msgid "Upload pictures."
+msgstr ""
+
+msgid "Walk mode"
+msgstr ""
+
+msgid "Start walk mode"
+msgstr ""
+
+msgid "Zoom to selected image"
+msgstr ""
+
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
+
+msgid "View in website"
+msgstr ""
+
+msgid "Copy key"
+msgstr ""
+
+msgid "Copy key tag"
+msgstr ""
+
+msgid "Edit on website"
+msgstr ""
+
+msgid "Current Mapillary changeset"
+msgstr ""
+
+msgid "Open Mapillary changeset dialog"
+msgstr ""
+
+msgid "Mapillary changeset"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Export all images"
+msgstr ""
+
+msgid "Export selected sequence"
+msgstr ""
+
+msgid "Export selected images"
+msgstr ""
+
+msgid "Rewrite imported images"
+msgstr ""
+
+msgid "Select a folder"
+msgstr ""
+
+msgid "Explore"
+msgstr ""
+
+msgid "Select a directory"
+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 "Mapillary picture"
+msgstr ""
+
+msgid "Open Mapillary window"
+msgstr ""
+
+msgid "Mapillary dialog"
+msgstr ""
+
+msgid "Open Mapillary main dialog"
+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 "Login"
+msgstr "Đăng nhập"
+
+msgid "Logout"
+msgstr "Thoát"
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -28076,9 +28578,6 @@ 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"
 
@@ -28110,9 +28609,6 @@ 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ý"
 
@@ -28690,9 +29186,6 @@ msgstr "mm"
 msgid "cm"
 msgstr "cm"
 
-msgid "m"
-msgstr "m"
-
 msgid "km"
 msgstr "km"
 
@@ -28883,21 +29376,9 @@ msgstr "hình ảnh nhập khẩu"
 msgid "Import vector graphics"
 msgstr "đồ họa vector nhập khẩu"
 
-msgid "Scale:"
-msgstr "Scale:"
-
-msgid "unit(s) = "
-msgstr "đơn vị (s) = "
-
-msgid "Importing..."
-msgstr "Nhập khẩu ..."
-
 msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr "các tập tin SVG [ImportVec Plugin] (* .svg)"
 
-msgid "Please open or create data layer before importing"
-msgstr "Hãy mở hoặc tạo lớp dữ liệu trước khi nhập khẩu"
-
 msgid "Concourse wizard ..."
 msgstr ""
 
@@ -29112,6 +29593,61 @@ msgstr "Số {0} -ways nút tìm thấy: {1}"
 msgid "generate all combinations from entrie/exit candidates"
 msgstr "tạo ra tất cả các kết hợp từ các ứng cử viên entrie / exit"
 
+msgid "Check the direction"
+msgstr ""
+
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
+msgstr ""
+
+msgid "Correct"
+msgstr ""
+
+msgid "Wrong"
+msgstr ""
+
+msgid "<HTML><U>C</U>orrect direction</HTML>"
+msgstr ""
+
+msgid "Direction of river is correct."
+msgstr ""
+
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
+msgstr ""
+
+msgid "Direction of river is wrong."
+msgstr ""
+
+msgid "<HTML><U>I</U>gnore this way</HTML>"
+msgstr ""
+
+msgid "Ignore direction of this way."
+msgstr ""
+
+msgid "Check direction of streams"
+msgstr ""
+
+msgid "Check direction of streams and rivers"
+msgstr ""
+
+msgid "No more directions to check!"
+msgstr ""
+
+msgid "Replace way"
+msgstr ""
+
+msgid "Replace way of selected way with a new way"
+msgstr ""
+
+msgid "Replace Geometry"
+msgstr "Thay thế Geometry"
+
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
+msgstr ""
+
 msgid "Direction index ''{0}'' not found"
 msgstr "Hướng index '' {0} '' không tìm thấy"
 
@@ -29364,400 +29900,6 @@ msgstr "Kích hoạt MapDust phóng lỗi plugin"
 msgid "Missing input data"
 msgstr "Thiếu dữ liệu đầu vào"
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "Total images:"
-msgstr ""
-
-msgid "images"
-msgstr ""
-
-msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
-
-msgid "Could not read font-file from ''{0}''"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Create Mapillary layer"
-msgstr ""
-
-msgid "Start Mapillary layer"
-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 "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Join Mapillary pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Start walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Uploaded {0} images"
-msgstr ""
-
-msgid "Approve upload on the website"
-msgstr ""
-
-msgid "View in website"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Copy key tag"
-msgstr ""
-
-msgid "Edit on website"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a folder"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Select a directory"
-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 "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Mapillary dialog"
-msgstr ""
-
-msgid "Open Mapillary main dialog"
-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 "Download mode"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-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 "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 "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-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 "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 "The image key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The image key must not be null here!"
-msgstr ""
-
-msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
-
-msgid "The sequence key must not be null here!"
-msgstr ""
-
 msgid "Measured values"
 msgstr "đo giá trị"
 
@@ -31284,6 +31426,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "di chuyển"
+
 msgid "rail"
 msgstr "đường sắt"
 
@@ -31381,9 +31526,6 @@ msgstr "Catch"
 msgid "Join"
 msgstr "Tham gia"
 
-msgid "moved"
-msgstr "di chuyển"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr "Giao thông vận tải công cộng: Tham gia GTFS dừng lại"
 
@@ -32437,6 +32579,66 @@ msgstr ""
 msgid "Terrace"
 msgstr "Terrace"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -32910,6 +33112,84 @@ msgstr "Chọn một ngày hết hạn cho các phím:"
 msgid "Create a new signing key"
 msgstr "Tạo một key bản hợp đồng mới"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "Chuyển tiếp"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "ngược"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "Không lane như vậy."
 
@@ -33851,9 +34131,6 @@ msgstr "Tìm nguyên thủy với những tag"
 msgid "Multitag Background: highlight"
 msgstr "Multitag Background: nổi bật"
 
-msgid "Replace Geometry"
-msgstr "Thay thế Geometry"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "Thay thế hình học của đối tượng được lựa chọn với một cái mới"
 
@@ -34063,15 +34340,9 @@ msgstr "bắt đầu / tạm dừng phát lại video"
 msgid "Video: {0}"
 msgstr "Video: {0}"
 
-msgid "Backward"
-msgstr "ngược"
-
 msgid "jumps n sec back"
 msgstr "nhảy n sec trở lại"
 
-msgid "Forward"
-msgstr "Chuyển tiếp"
-
 msgid "jumps n sec forward"
 msgstr "nhảy n giây về phía trước"
 
diff --git a/i18n/po/wae.po b/i18n/po/wae.po
index 709ddfc..9bd6cdc 100644
--- a/i18n/po/wae.po
+++ b/i18n/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
+"POT-Creation-Date: 2016-11-06 22:51+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: 2016-09-06 05:53+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:19+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -203,28 +203,28 @@ msgstr ""
 msgid "Add imagery layer {0}"
 msgstr ""
 
-msgid "Error"
+msgid "Invalid service URL."
 msgstr ""
 
-msgid "Select image format for WMS layer"
+msgid "WMS Error"
 msgstr ""
 
-msgid "Select WMS layers"
+msgid "Could not retrieve WMS layer list."
 msgstr ""
 
-msgid "Add layers"
+msgid "Could not parse WMS layer list."
 msgstr ""
 
-msgid "Invalid service URL."
+msgid "Error"
 msgstr ""
 
-msgid "WMS Error"
+msgid "Select image format for WMS layer"
 msgstr ""
 
-msgid "Could not retrieve WMS layer list."
+msgid "Select WMS layers"
 msgstr ""
 
-msgid "Could not parse WMS layer list."
+msgid "Add layers"
 msgstr ""
 
 msgid "Add Node..."
@@ -3277,9 +3277,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3681,10 +3678,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3721,6 +3718,9 @@ msgstr ""
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
 msgid "Unconnected coastline"
 msgstr ""
 
@@ -3730,6 +3730,9 @@ msgstr ""
 msgid "Reversed coastline"
 msgstr ""
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3766,6 +3769,12 @@ msgstr ""
 msgid "Crossing barriers"
 msgstr ""
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3984,6 +3993,12 @@ msgstr ""
 msgid "Non-Way in multipolygon"
 msgstr ""
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr ""
 
@@ -4194,30 +4209,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr ""
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
+msgid "Key ''{0}'' looks like ''{1}''."
 msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgid "Key ''{0}'' not in presets."
 msgstr ""
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr ""
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
 msgid "FIXMES"
 msgstr ""
 
@@ -4461,9 +4476,6 @@ msgstr ""
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-msgid "Reversed coastline: land not on left side"
-msgstr ""
-
 msgid "Reversed land: land not on left side"
 msgstr ""
 
@@ -4984,9 +4996,6 @@ msgstr ""
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr ""
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6406,6 +6415,9 @@ msgstr ""
 msgid "Sort"
 msgstr ""
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr ""
 
@@ -6645,6 +6657,14 @@ msgstr ""
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr ""
 
@@ -7917,9 +7937,6 @@ msgstr ""
 msgid "Areas around places"
 msgstr ""
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
 msgid "Search ..."
 msgstr ""
 
@@ -8483,6 +8500,9 @@ msgstr ""
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
@@ -8534,6 +8554,12 @@ msgstr ""
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr ""
 
@@ -8546,6 +8572,12 @@ msgstr ""
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr ""
 
@@ -10599,6 +10631,9 @@ msgstr ""
 msgid "Draw segment order numbers"
 msgstr ""
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
@@ -12680,6 +12715,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr ""
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
 msgid "Note Files"
 msgstr ""
 
@@ -13042,6 +13080,9 @@ msgstr ""
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14685,6 +14726,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14796,7 +14840,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -14975,6 +15022,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15269,18 +15319,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15290,6 +15328,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15422,6 +15463,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15789,6 +15833,9 @@ msgstr ""
 msgid "Downloads OSM data along a way"
 msgstr ""
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15903,6 +15950,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
@@ -16100,6 +16150,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16122,6 +16177,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
@@ -16278,6 +16336,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr ""
 
@@ -17598,6 +17660,9 @@ msgstr ""
 msgid "Ford"
 msgstr ""
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr ""
 
@@ -19217,6 +19282,9 @@ msgstr ""
 msgid "Taxiway"
 msgstr ""
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr ""
 
@@ -19887,10 +19955,10 @@ msgstr ""
 msgid "Point Name"
 msgstr ""
 
-msgid "Phone Number"
+msgid "Emergency Phone Number"
 msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
+msgid "(Use number as shown on plate.)"
 msgstr ""
 
 msgid "Veterinary"
@@ -19905,6 +19973,12 @@ msgstr ""
 msgid "Automated Defibrillator"
 msgstr ""
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
 msgid "Located inside a building?"
 msgstr ""
 
@@ -20774,6 +20848,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20858,6 +20936,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23063,7 +23145,13 @@ msgstr ""
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23730,16 +23818,10 @@ msgstr ""
 msgid "Bicycle Route"
 msgstr ""
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
+msgid "national"
 msgstr ""
 
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23748,18 +23830,6 @@ msgstr ""
 msgid "Hiking Route"
 msgstr ""
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23772,18 +23842,6 @@ msgstr ""
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -23976,9 +24034,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -23988,6 +24057,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24003,39 +24078,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24054,9 +24114,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr ""
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24111,10 +24180,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24130,7 +24205,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24175,7 +24250,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24209,6 +24284,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24227,6 +24305,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24317,10 +24398,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24566,6 +24650,27 @@ msgstr ""
 msgid "Uploads traces to openstreetmap.org"
 msgstr ""
 
+msgid "Importing..."
+msgstr ""
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr ""
+
+msgid "unit(s) = "
+msgstr ""
+
+msgid "m"
+msgstr ""
+
 msgid "Shows elevation profile"
 msgstr ""
 
@@ -24904,3267 +25009,3304 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
+msgid "Join/unjoin pictures"
 msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
+msgid "Join Mapillary pictures"
 msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
+msgid "Upload pictures"
 msgstr ""
 
-msgid "apply {0}"
+msgid "Upload Mapillary pictures"
 msgstr ""
 
-msgid "There is something wrong in the value near:"
+msgid "Upload pictures."
 msgstr ""
 
-msgid "Info: {0}"
+msgid "Walk mode"
 msgstr ""
 
-msgid "Correct the value manually and than press Enter."
+msgid "Start walk mode"
 msgstr ""
 
-msgid "Error in timeformat"
+msgid "Zoom to selected image"
 msgstr ""
 
-msgid "open end"
+msgid "Zoom to the currently selected Mapillary image"
 msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
+msgid "Export selected images"
 msgstr ""
 
-msgid "Define Address Interpolation"
+msgid "Rewrite imported images"
 msgstr ""
 
-msgid "Odd"
+msgid "Select a folder"
 msgstr ""
 
-msgid "Even"
+msgid "Explore"
 msgstr ""
 
-msgid "Alphabetic"
+msgid "Select a directory"
 msgstr ""
 
-msgid "Numeric"
+msgid "Speed limit"
 msgstr ""
 
-msgid "Actual"
+msgid "Give way"
 msgstr ""
 
-msgid "Estimate"
+msgid "No entry"
 msgstr ""
 
-msgid "Potential"
+msgid "Intersection danger"
 msgstr ""
 
-msgid "Relation: {0}"
+msgid "Mandatory direction (any)"
 msgstr ""
 
-msgid "Associate with street using:"
+msgid "Uneven road"
 msgstr ""
 
-msgid "Numbering Scheme:"
+msgid "No parking"
 msgstr ""
 
-msgid "Increment:"
+msgid "No overtaking"
 msgstr ""
 
-msgid "Starting #:"
+msgid "Pedestrian crossing"
 msgstr ""
 
-msgid "Ending #:"
+msgid "No turn"
 msgstr ""
 
-msgid "Accuracy:"
+msgid "Years"
 msgstr ""
 
-msgid "Convert way to individual house numbers."
+msgid "Months"
 msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
+msgid "Days"
 msgstr ""
 
-msgid "City:"
+msgid "Imported images"
 msgstr ""
 
-msgid "State:"
+msgid "Mapillary filter"
 msgstr ""
 
-msgid "Post Code:"
+msgid "Open Mapillary filter dialog"
 msgstr ""
 
-msgid "Country:"
+msgid "Not older than: "
 msgstr ""
 
-msgid "Full Address:"
+msgid "Downloaded images"
 msgstr ""
 
-msgid "Optional Information:"
+msgid "Only images with signs"
 msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
+msgid "Choose signs"
 msgstr ""
 
-msgid "Please select address interpolation way for this street"
+msgid "Mapillary history"
 msgstr ""
 
-msgid "Expected odd numbers for addresses"
+msgid "Open Mapillary history dialog"
 msgstr ""
 
-msgid "Expected even numbers for addresses"
+msgid "Mapillary picture"
 msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
+msgid "Mapillary dialog"
 msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
+msgid "Open Mapillary main dialog"
 msgstr ""
 
-msgid "Alphabetic address must end with a letter"
+msgid "Next picture"
 msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgid "Shows the next picture in the sequence"
 msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
+msgid "Previous picture"
 msgstr ""
 
-msgid "Please enter valid number for starting address"
+msgid "Shows the previous picture in the sequence"
 msgstr ""
 
-msgid "Please enter valid number for ending address"
+msgid "Jump to red"
 msgstr ""
 
-msgid "Starting address number must be less than ending address number"
+msgid "Jumps to the picture at the other side of the red line"
 msgstr ""
 
-msgid "Align Way Segments"
+msgid "Jump to blue"
 msgstr ""
 
-msgid "Align Ways"
+msgid "Jumps to the picture at the other side of the blue line"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Pause"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Pauses the walk."
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Align way segment"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Preview images when hovering its icon"
 msgstr ""
 
-msgid "Align Way Segments: Modes"
+msgid "Login"
 msgstr ""
 
-msgid "Align Ways control panel"
+msgid "Logout"
 msgstr ""
 
-msgid "This panel activates in Align Ways mode:"
+msgid "Download mode"
 msgstr ""
 
-msgid "Length preserved"
+msgid "You are logged in as ''{0}''."
 msgstr ""
 
-msgid "Angle preserved"
+msgid "You are currently not logged in."
 msgstr ""
 
-msgid "Align with:"
+msgid "Go to setting and log in to Mapillary before uploading."
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Upload selected sequence"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Delete after upload"
 msgstr ""
 
-msgid "I''m ready!"
+msgid "Wait for full quality pictures"
 msgstr ""
 
-msgid "AlignWays Tips"
+msgid "Follow selected image"
 msgstr ""
 
-msgid "AlignWays: What''s New..."
+msgid "Go forward"
 msgstr ""
 
-msgid "Align Ways mode"
-msgstr ""
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images joined"
 msgstr ""
 
-msgid "AlignWayS message"
+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 ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+msgid "everything in the visible area"
 msgstr ""
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "areas with downloaded OSM-data"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "only when manually requested"
 msgstr ""
 
 msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Select mode"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "Login successful, return to JOSM."
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Submitting Mapillary Changeset"
 msgstr ""
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
 msgstr ""
 
-msgid "Don''t show this again"
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
 
-msgid "What''s new..."
+msgid "Finished upload"
 msgstr ""
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
+msgid "Not Logged in to Mapillary"
 msgstr ""
 
-msgid "Errr..."
+msgid "Uploading: {0}"
 msgstr ""
 
-msgid "Browser not supported."
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Building address"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "empty"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "skip"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "House number:"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Street:"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Post code:"
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Building:"
+msgid "Correlate with GPX..."
 msgstr ""
 
-msgid "Tags:"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Name:"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "updated building info"
+msgid "Save layer..."
 msgstr ""
 
-msgid "Tag Element"
+msgid "Save NanoLog layer"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Tag Building"
+msgid "Open NanoLog file..."
 msgstr ""
 
-msgid "Tools: {0}"
+msgid "Could not read NanoLog file:"
 msgstr ""
 
-msgid "Area Selection"
+msgid "OSM Recommendation"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid "Area Selector"
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Created area"
+msgid "Model Settings"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Error Report"
+msgid "Add Recommendation"
 msgstr ""
 
-msgid "Something went wrong!"
+msgid "Add a recommended key/value pair to your object"
 msgstr ""
 
-msgid "Please file a bug report on the github project page under"
+msgid "Train a Model"
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Start the training engine!"
 msgstr ""
 
-msgid "Area Selector - Preferences"
+msgid "Edit opening hours"
 msgstr ""
 
-msgid "Settings for the area detection algorithm."
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-msgid "Boofcv - high resolution images"
+msgid "edit existing tag"
 msgstr ""
 
-msgid "Custom - low resolution images"
+msgid "edit new tag"
 msgstr ""
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
+msgid "Display clock in 12h mode."
 msgstr ""
 
-msgid "Algorithm"
+msgid "Choose key"
 msgstr ""
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+msgid "apply {0}"
 msgstr ""
 
-msgid "Distance Tolerance"
+msgid "There is something wrong in the value near:"
 msgstr ""
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
+msgid "Info: {0}"
 msgstr ""
 
-msgid "Angle Tolerance"
+msgid "Correct the value manually and than press Enter."
 msgstr ""
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
+msgid "Error in timeformat"
 msgstr ""
 
-msgid "Color Threshold"
+msgid "open end"
 msgstr ""
 
-msgid "Use HSV based algorithm"
+msgid "Import Osm Inspector Bugs..."
 msgstr ""
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
+msgid "OsmInspector"
 msgstr ""
 
-msgid "How often thinning operation should be applied (Default {0})."
+msgid "Open OsmInspector"
 msgstr ""
 
-msgid "Thinning Iterations"
+msgid "OsmBugInfo"
 msgstr ""
 
-msgid "show address dialog"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid "Show Address Dialog after mapping an area"
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "merge nodes"
+msgid "Prev OSMI bug"
 msgstr ""
 
-msgid "Merge nodes with existing nodes"
+msgid "Next OSMI bug"
 msgstr ""
 
-msgid "Debug"
+msgid "OSM Inspector Bugs"
 msgstr ""
 
-msgid "Debugging mode will write images for each processing step."
+msgid "Selected Bug Info"
 msgstr ""
 
-msgid "Building Generalization"
+msgid "Handy Address Interpolation Functions"
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Define Address Interpolation"
 msgstr ""
 
-msgid "There is no frame loaded !"
+msgid "Odd"
 msgstr ""
 
-msgid "Alert Message"
+msgid "Even"
 msgstr ""
 
-msgid "Street Name:"
+msgid "Alphabetic"
 msgstr ""
 
-msgid "Big buildings mode"
+msgid "Numeric"
 msgstr ""
 
-msgid "Rotate crosshair"
+msgid "Actual"
 msgstr ""
 
-msgid "Advanced settings"
+msgid "Estimate"
 msgstr ""
 
-msgid "Buildings tags:"
+msgid "Potential"
 msgstr ""
 
-msgid "Cannot place building outside of the world."
+msgid "Relation: {0}"
 msgstr ""
 
-msgid "Create building"
+msgid "Associate with street using:"
 msgstr ""
 
-msgid "Set buildings size"
+msgid "Numbering Scheme:"
 msgstr ""
 
-msgid "Use Address dialog"
+msgid "Increment:"
 msgstr ""
 
-msgid "Auto-select building"
+msgid "Starting #:"
 msgstr ""
 
-msgid "Use address nodes under buildings"
+msgid "Ending #:"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Accuracy:"
 msgstr ""
 
-msgid "Length step:"
+msgid "Convert way to individual house numbers."
 msgstr ""
 
-msgid "Advanced..."
+msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-msgid "Draw buildings"
+msgid "City:"
 msgstr ""
 
-msgid "Point on the corner of the building to start drawing"
+msgid "State:"
 msgstr ""
 
-msgid "Point on opposite end of the building"
+msgid "Post Code:"
 msgstr ""
 
-msgid "Set width of the building"
+msgid "Country:"
 msgstr ""
 
-msgid "Merge address points"
+msgid "Full Address:"
 msgstr ""
 
-msgid "Move tags from address nodes inside buildings to building ways"
+msgid "Optional Information:"
 msgstr ""
 
-msgid "Select both address nodes and building ways to merge"
+msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-msgid "No address nodes found in the selection"
+msgid "Please select address interpolation way for this street"
 msgstr ""
 
-msgid "No building ways found in the selection"
+msgid "Expected odd numbers for addresses"
 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] ""
+msgid "Expected even numbers for addresses"
+msgstr ""
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Expected valid number for increment"
+msgstr ""
 
-msgid "No address nodes inside buildings found"
+msgid "Country code must be 2 letters"
 msgstr ""
 
-msgid "on polygon"
+msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-msgid "Add address"
+msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-msgid "Helping tool for tag address"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-msgid "CadastreFR - Buildings"
+msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-msgid "Next no"
+msgid "Please enter valid number for starting address"
 msgstr ""
 
-msgid "Enter addresses"
+msgid "Please enter valid number for ending address"
 msgstr ""
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Starting address number must be less than ending address number"
 msgstr ""
 
-msgid "Select Feuille"
+msgid "Align Way Segments"
 msgstr ""
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
+msgid "Align Ways"
 msgstr ""
 
-msgid "Lambert Zone {0} cache file (.{0})"
+msgid ""
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgid ""
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgid ""
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgid ""
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
 msgstr ""
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgid ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
 
-msgid "Reunion RGR92 cache file (.UTM4)"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "CadastreGrabber: Illegal url."
+msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+msgid "Align way segment"
 msgstr ""
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
 msgstr ""
 
-msgid "Choose from..."
+msgid "Align Way Segments: Modes"
 msgstr ""
 
-msgid "Select commune"
+msgid "Align Ways control panel"
 msgstr ""
 
-msgid "Auto sourcing"
+msgid "This panel activates in Align Ways mode:"
 msgstr ""
 
-msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+msgid "Length preserved"
 msgstr ""
 
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Angle preserved"
+msgstr ""
+
+msgid "Align with:"
 msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
 msgstr ""
 
-msgid "Change the current projection"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
+msgid "I''m ready!"
 msgstr ""
 
-msgid "Reverse grey colors (for black backgrounds)."
+msgid "AlignWays Tips"
 msgstr ""
 
-msgid "Set background transparent."
+msgid "AlignWays: What''s New..."
 msgstr ""
 
-msgid "Draw boundaries of downloaded data."
+msgid "Align Ways mode"
 msgstr ""
 
-msgid "Disable image cropping during georeferencing."
+msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
-msgid "Use \"Tableau d''assemblage\""
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
 msgstr ""
 
-msgid "Replace grey shades by white color only"
+msgid "AlignWayS message"
 msgstr ""
 
-msgid "Select first WMS layer in list."
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
 msgstr ""
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
 msgstr ""
 
-msgid "off"
+msgid ": Align segments; Alt-click: Clear selection"
 msgstr ""
 
-msgid "25 m"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "50 m"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
 msgstr ""
 
-msgid "100 m"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
 msgstr ""
 
-msgid "high"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
 
-msgid "medium"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "low"
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "symbol"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "parcel number"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "address"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
 
-msgid "locality"
+msgid "Don''t show this again"
 msgstr ""
 
-msgid "section"
+msgid "What''s new..."
 msgstr ""
 
-msgid "commune"
+msgid "Added <b>angle preserving</b> aligning mode"
 msgstr ""
 
-msgid "Enable automatic caching."
+msgid "Various improvements and bugfixes"
 msgstr ""
 
-msgid "Max. cache size (in MB)"
+msgid "Errr..."
 msgstr ""
 
-msgid "French cadastre WMS"
+msgid "Browser not supported."
 msgstr ""
 
-msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+msgid "Building address"
 msgstr ""
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgid "empty"
 msgstr ""
 
-msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+msgid "skip"
 msgstr ""
 
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "House number:"
 msgstr ""
 
-msgid "Allows multiple layers stacking"
+msgid "Street:"
 msgstr ""
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgid "Post code:"
 msgstr ""
 
-msgid "Draw a rectangle around downloaded data from WMS server."
+msgid "Building:"
 msgstr ""
 
-msgid "Image resolution:"
+msgid "Tags:"
 msgstr ""
 
-msgid "High resolution (1000x800)"
+msgid "Name:"
 msgstr ""
 
-msgid "Medium resolution (800x600)"
+msgid "updated building info"
 msgstr ""
 
-msgid "Low resolution (600x400)"
+msgid "Tag Element"
 msgstr ""
 
-msgid "Image filter interpolation:"
+msgid "Select an item to tag."
 msgstr ""
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgid "Tag Building"
 msgstr ""
 
-msgid "Bilinear (fast)"
+msgid "Tools: {0}"
 msgstr ""
 
-msgid "Bicubic (slow)"
+msgid "Area Selection"
 msgstr ""
 
-msgid "Vector images grab multiplier:"
+msgid "Select an area (e.g. building) from an underlying image."
 msgstr ""
 
-msgid "Grab one image full screen"
+msgid "Area Selector"
 msgstr ""
 
-msgid "Grab smaller images (higher quality but use more memory)"
+msgid "Created area"
 msgstr ""
 
-msgid "Fixed size square (default is 100m)"
+msgid "Unable to detect a polygon where you clicked."
 msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
+msgid "Error Report"
 msgstr ""
 
-msgid "Layers:"
+msgid "Something went wrong!"
 msgstr ""
 
-msgid "Sea, rivers, swimming pools."
+msgid "Please file a bug report on the github project page under"
 msgstr ""
 
-msgid "Buildings, covers, underground constructions."
+msgid ""
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Symbols like cristian cross."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Parcels."
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Parcels numbers, street names."
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Address, houses numbers."
+msgid "Custom - low resolution images"
 msgstr ""
 
-msgid "Locality, hamlet, place."
+msgid ""
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
 msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Algorithm"
 msgstr ""
 
-msgid "Municipality administrative borders."
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
 msgstr ""
 
-msgid "Raster images grab multiplier:"
+msgid "Distance Tolerance"
 msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Angle Tolerance"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Color Threshold"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
+msgid "Use HSV based algorithm"
 msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "How often thinning operation should be applied (Default {0})."
+msgstr ""
+
+msgid "Thinning Iterations"
+msgstr ""
+
+msgid "show address dialog"
+msgstr ""
+
+msgid "Show Address Dialog after mapping an area"
+msgstr ""
+
+msgid "merge nodes"
+msgstr ""
+
+msgid "Merge nodes with existing nodes"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Debugging mode will write images for each processing step."
+msgstr ""
+
+msgid "Building Generalization"
+msgstr ""
+
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Unexpected file extension. {0}"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Downloading {0}"
+msgid "Street Name:"
 msgstr ""
 
-msgid "Contacting WMS Server..."
+msgid "Big buildings mode"
 msgstr ""
 
-msgid "Create buildings"
+msgid "Rotate crosshair"
 msgstr ""
 
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+msgid "Advanced settings"
 msgstr ""
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "Buildings tags:"
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
+msgid "Cannot place building outside of the world."
 msgstr ""
 
-msgid "Extract best fitting boundary..."
+msgid "Create building"
 msgstr ""
 
-msgid "Create boundary"
+msgid "Set buildings size"
 msgstr ""
 
-msgid "Contacting cadastre WMS ..."
+msgid "Use Address dialog"
 msgstr ""
 
-msgid "Image already loaded"
+msgid "Auto-select building"
 msgstr ""
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
+msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Buildings width:"
 msgstr ""
 
-msgid "Extract commune boundary"
+msgid "Length step:"
 msgstr ""
 
-msgid "Only on vectorized layers"
+msgid "Advanced..."
 msgstr ""
 
-msgid "Cancel current grab"
+msgid "Draw buildings"
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "Point on the corner of the building to start drawing"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Point on opposite end of the building"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
+msgid "Set width of the building"
 msgstr ""
 
-msgid "Cadastre: {0}"
+msgid "Merge address points"
 msgstr ""
 
-msgid "Georeference an image"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Grab non-georeferenced image"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Georeferencing interrupted"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Load layer from cache"
-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] ""
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "{0} not allowed with the current projection"
+msgid "No address nodes inside buildings found"
 msgstr ""
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "on polygon"
 msgstr ""
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Add address"
 msgstr ""
 
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Helping tool for tag address"
 msgstr ""
 
-msgid "(optional)"
+msgid "CadastreFR - Buildings"
 msgstr ""
 
-msgid "Change location"
+msgid "Next no"
 msgstr ""
 
-msgid "Set a new location for the next request"
+msgid "Enter addresses"
 msgstr ""
 
-msgid "Add a new municipality layer"
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
 
-msgid "Commune"
+msgid "Select Feuille"
 msgstr ""
 
 msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
 
-msgid "Departement"
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr ""
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
 msgstr ""
 
-msgid "Add new layer"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
 msgstr ""
 
-msgid "Open Cadastre Preferences"
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "Reunion RGR92 cache file (.UTM4)"
 msgstr ""
 
-msgid "Reset cookie"
+msgid "CadastreGrabber: Illegal url."
 msgstr ""
 
-msgid "Get a new cookie (session timeout)"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
 
-msgid "Save image as..."
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 
-msgid "PNG files (*.png)"
+msgid "Choose from..."
 msgstr ""
 
-msgid "GeoTiff files (*.tif)"
+msgid "Select commune"
 msgstr ""
 
-msgid "Export image (only raster images)"
+msgid "Auto sourcing"
 msgstr ""
 
 msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
 
-msgid "Image cropping"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
 msgstr ""
 
-msgid "Image georeferencing"
+msgid "Change the current projection"
 msgstr ""
 
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Replace original background by JOSM background color."
 msgstr ""
 
-msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-msgid "Enter cadastre east,north position"
+msgid "Set background transparent."
 msgstr ""
 
-msgid "(Warning: verify north with arrow !!)"
+msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-msgid "East"
+msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-msgid "I use the mouse"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid "Set {0} Lambert coordinates"
+msgid "Replace grey shades by white color only"
 msgstr ""
 
-msgid "Click second corner for image cropping"
+msgid "Select first WMS layer in list."
 msgstr ""
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
-msgid "Adjust WMS"
+msgid "off"
 msgstr ""
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgid "25 m"
 msgstr ""
 
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+msgid "50 m"
 msgstr ""
 
-msgid "Reset offset"
+msgid "100 m"
 msgstr ""
 
-msgid "Reset offset (only vector images)"
+msgid "high"
 msgstr ""
 
-msgid "Blank Layer"
+msgid "medium"
 msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "low"
 msgstr ""
 
-msgid "Is not vectorized."
+msgid "symbol"
 msgstr ""
 
-msgid "Bounding box: {0}"
+msgid "parcel"
 msgstr ""
 
-msgid "Image size (px): {0}/{1}"
+msgid "parcel number"
 msgstr ""
 
-msgid "Is vectorized."
+msgid "address"
 msgstr ""
 
-msgid "Commune bbox: {0}"
+msgid "locality"
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "section"
 msgstr ""
 
-msgid "Cache Format Error"
+msgid "commune"
 msgstr ""
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgid "Enable automatic caching."
 msgstr ""
 
-msgid "Cache Lambert Zone Error"
+msgid "Max. cache size (in MB)"
 msgstr ""
 
-msgid "canvec tile helper"
+msgid "French cadastre WMS"
 msgstr ""
 
-msgid "Use"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
-msgid "Please select a scheme to use."
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-msgid "Color Scheme"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Please select the scheme to delete."
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
 msgstr ""
 
-msgid "Use the selected scheme from the list."
+msgid "Allows multiple layers stacking"
 msgstr ""
 
-msgid "Use the current colors as a new color scheme."
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-msgid "Delete the selected scheme from the list."
+msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-msgid "Color Schemes"
+msgid "Image resolution:"
 msgstr ""
 
-msgid "Conflate object pair"
+msgid "High resolution (1000x800)"
 msgstr ""
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Medium resolution (800x600)"
+msgstr ""
 
-msgid "Conflation"
+msgid "Low resolution (600x400)"
 msgstr ""
 
-msgid "Activates the conflation plugin"
+msgid "Image filter interpolation:"
 msgstr ""
 
-msgid "Matches"
+msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-msgid "Reference only"
+msgid "Bilinear (fast)"
 msgstr ""
 
-msgid "Subject only"
+msgid "Bicubic (slow)"
 msgstr ""
 
-msgid "Matches ({0})"
+msgid "Vector images grab multiplier:"
 msgstr ""
 
-msgid "Reference only ({0})"
+msgid "Grab one image full screen"
 msgstr ""
 
-msgid "Subject only ({0})"
+msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-msgid "Configure"
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-msgid "Configure conflation options"
+msgid "Layers:"
 msgstr ""
 
-msgid "Delete {0} conflation matches"
+msgid "Sea, rivers, swimming pools."
 msgstr ""
 
-msgid "Remove {0} unmatched objects"
+msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-msgid "Remove selected matches"
+msgid "Symbols like cristian cross."
 msgstr ""
 
-msgid "Conflate"
+msgid "Parcels."
 msgstr ""
 
-msgid "Conflate selected objects"
+msgid "Parcels numbers, street names."
 msgstr ""
 
-msgid "Conflation: {0}"
+msgid "Address, houses numbers."
 msgstr ""
 
-msgid "Cannot replace geometry."
+msgid "Locality, hamlet, place."
 msgstr ""
 
-msgid "Zoom to selected primitive(s)"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Select selected primitive(s)"
+msgid "Municipality administrative borders."
 msgstr ""
 
-msgid "Select the primitives currently selected in the list"
+msgid "Raster images grab multiplier:"
 msgstr ""
 
-msgid "Match finder settings"
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Match finder method"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Threshold distance"
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Distances greater than this will result in a score of zero."
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "Centroid distance"
+msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-msgid "Hausdorff distance"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
 msgstr ""
 
-msgid "Configure conflation settings"
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
-msgid "Generate matches"
+msgid "Unexpected file extension. {0}"
 msgstr ""
 
-msgid "Layer:"
+msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Downloading {0}"
 msgstr ""
 
-msgid "Subject"
+msgid "Contacting WMS Server..."
 msgstr ""
 
-msgid "Selections must be made for both reference and subject."
+msgid "Create buildings"
 msgstr ""
 
-msgid "Incomplete selections"
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
 
-msgid "Restore subject selection"
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Restore reference selection"
+msgid "Extract SVG ViewBox..."
 msgstr ""
 
-msgid "Freeze subject selection"
+msgid "Extract best fitting boundary..."
 msgstr ""
 
-msgid "No valid OSM data layer present."
+msgid "Create boundary"
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Image already loaded"
 msgstr ""
 
-msgid "Empty selection"
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
-msgid "Freeze reference selection"
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgid "Extract commune boundary"
 msgstr ""
 
-msgid "Invalid reference or subject"
+msgid "Only on vectorized layers"
 msgstr ""
 
-msgid "Download OSM data continuously"
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Download map data continuously when paning and zooming."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
 
-msgid "Toggle the continuous download on/off"
+msgid "Cadastre grab"
 msgstr ""
 
-msgid "Activate continuous downloads at startup."
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-msgid "Supress the default modal progress monitor when downloading."
+msgid "Cadastre: {0}"
 msgstr ""
 
-msgid "Download Settings"
+msgid "Georeference an image"
 msgstr ""
 
-msgid "Settings for the continuous download."
+msgid "Grab non-georeferenced image"
 msgstr ""
 
-msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+msgid "Georeferencing interrupted"
 msgstr ""
 
 msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
-msgstr ""
-
-msgid "Requires restart"
+"This image contains georeference data.\n"
+"Do you want to use them ?"
 msgstr ""
 
-msgid "Max threads"
+msgid "Load layer from cache"
 msgstr ""
 
-msgid "Maximum number of boxes to download for each pan/zoom."
+msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-msgid "Max download boxes"
+msgid "{0} not allowed with the current projection"
 msgstr ""
 
 msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
+"Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
-msgid "Wait time (milliseconds)"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
-msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
+msgid "The location {0} is already on screen. Cache not loaded."
 msgstr ""
 
-msgid "Extra download area"
+msgid "(optional)"
 msgstr ""
 
-msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+msgid "Change location"
 msgstr ""
 
-msgid "Max download area"
+msgid "Set a new location for the next request"
 msgstr ""
 
-msgid "The strategy for finding what areas to request from the server."
+msgid "Add a new municipality layer"
 msgstr ""
 
-msgid "Download strategy"
+msgid "Commune"
 msgstr ""
 
 msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
-msgid "Split area"
+msgid "Departement"
 msgstr ""
 
-msgid "Splits an area by an untagged way."
+msgid "<html>Departement number (optional)</html>"
 msgstr ""
 
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Add new layer"
 msgstr ""
 
-msgid "TangoGPS Files (*.log)"
+msgid "Open Cadastre Preferences"
 msgstr ""
 
-msgid "Coordinates imported: "
+msgid "Refine georeferencing"
 msgstr ""
 
-msgid "Format errors: "
+msgid "Improve georeferencing (only raster images)"
 msgstr ""
 
-msgid "TangoGPS import success"
+msgid "Reset cookie"
 msgstr ""
 
-msgid "TangoGPS import failure!"
+msgid "Get a new cookie (session timeout)"
 msgstr ""
 
-msgid "TCX Files (*.tcx)"
+msgid "Save image as..."
 msgstr ""
 
-msgid "Download along..."
+msgid "PNG files (*.png)"
 msgstr ""
 
-msgid "Download OSM data along the selected ways."
+msgid "GeoTiff files (*.tif)"
 msgstr ""
 
-msgid "Download Along"
+msgid "Export image (only raster images)"
 msgstr ""
 
-msgid "Please select 1 or more ways to download along"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
 msgstr ""
 
-msgid "Download from OSM along selected ways"
+msgid "Image cropping"
 msgstr ""
 
-msgid "{0} intermediate nodes to download."
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
 msgstr ""
 
-msgid "between {0} {1} and {2} {3}"
+msgid "Image georeferencing"
 msgstr ""
 
-msgid "  adding {0} {1}"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
 msgstr ""
 
-msgid "EditGpx"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
 msgstr ""
 
-msgid "Layer for editing GPX tracks"
+msgid "Enter cadastre east,north position"
 msgstr ""
 
-msgid "Convert to GPX layer with anonymised time"
+msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-msgid "edit gpx tracks"
+msgid "East"
 msgstr ""
 
-msgid "Import path from GPX layer"
+msgid "I use the mouse"
 msgstr ""
 
-msgid "Drop existing path"
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-msgid "No GPX data layer found."
+msgid "Click second corner for image cropping"
 msgstr ""
 
-msgid "External tool error"
+msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-msgid "Error executing the script:"
+msgid "Adjust WMS"
 msgstr ""
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
 msgstr ""
 
-msgid "exttool:{0}"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
-msgid "External Tool: {0}"
+msgid "Reset offset"
 msgstr ""
 
-msgid "Edit tool"
+msgid "Reset offset (only vector images)"
 msgstr ""
 
-msgid "CmdLine:"
+msgid "Blank Layer"
 msgstr ""
 
-msgid "External tools"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-msgid "Delete tool \"{0}\"?"
+msgid "Is not vectorized."
 msgstr ""
 
-msgid "Are you sure?"
+msgid "Bounding box: {0}"
 msgstr ""
 
-msgid "New tool..."
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Install"
+msgid "Is vectorized."
 msgstr ""
 
-msgid "Public"
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Could not get server response, check logs"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
 
-msgid "Failed to login as {0}:"
+msgid "Cache Format Error"
 msgstr ""
 
-msgid "The server did not return user ID"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-msgid "Failed to get messages as {0}:"
+msgid "Cache Lambert Zone Error"
 msgstr ""
 
-msgid "GeoChat"
+msgid "canvec tile helper"
 msgstr ""
 
-msgid "Open GeoChat panel"
+msgid "Use"
 msgstr ""
 
-msgid "Zoom in to see messages"
+msgid "Please select a scheme to use."
 msgstr ""
 
-msgid "Login"
+msgid "Color Scheme"
 msgstr ""
 
-msgid "Enable autologin"
+msgid "Please select the scheme to delete."
 msgstr ""
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "not logged in"
+msgid "Use the selected scheme from the list."
 msgstr ""
 
-msgid "Failed to log in to GeoChat:"
+msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-msgid "Failed to send message:"
+msgid "Delete the selected scheme from the list."
 msgstr ""
 
-msgid "User {0} has left"
+msgid "Color Schemes"
 msgstr ""
 
-msgid "User {0} is mapping nearby"
+msgid "Conflate object pair"
 msgstr ""
 
-msgid "Users mapping nearby:"
-msgstr ""
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Private chat"
+msgid "Conflation"
 msgstr ""
 
-msgid "Close tab"
+msgid "Activates the conflation plugin"
 msgstr ""
 
-msgid "Logout"
+msgid "Matches"
 msgstr ""
 
-msgid "Clear log"
+msgid "Reference only"
 msgstr ""
 
-msgid "Show users on map"
+msgid "Subject only"
 msgstr ""
 
-msgid "GeoJSON file"
+msgid "Matches ({0})"
 msgstr ""
 
-msgid "Loading json file..."
+msgid "Reference only ({0})"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Subject only ({0})"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Configure"
 msgstr ""
 
-msgid "Position only"
+msgid "Configure conflation options"
 msgstr ""
 
-msgid "Position, Time, Date, Speed"
+msgid "Delete {0} conflation matches"
 msgstr ""
 
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Remove {0} unmatched objects"
 msgstr ""
 
-msgid "A By Time"
+msgid "Remove selected matches"
 msgstr ""
 
-msgid "A By Distance"
+msgid "Conflate"
 msgstr ""
 
-msgid "B By Time"
+msgid "Conflate selected objects"
 msgstr ""
 
-msgid "B By Distance"
+msgid "Conflation: {0}"
 msgstr ""
 
-msgid "C By Time"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "C By Distance"
+msgid "Zoom to selected primitive(s)"
 msgstr ""
 
-msgid "Data Logging Format"
+msgid "Select selected primitive(s)"
 msgstr ""
 
-msgid "Disable data logging if speed falls below"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Disable data logging if distance falls below"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Unknown logFormat"
+msgid "Match finder method"
 msgstr ""
 
-msgid "Port:"
+msgid "Threshold distance"
 msgstr ""
 
-msgid "refresh the port list"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Configure Device"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Connection Error."
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "configure the connected DG100"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "delete data after import"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Importing data from device."
+msgid "Layer:"
 msgstr ""
 
-msgid "Importing data from DG100..."
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
 msgstr ""
 
-msgid "Error deleting data."
+msgid "Subject"
 msgstr ""
 
-msgid "imported data from {0}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "No data found on device."
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Connection failed."
+msgid "Restore subject selection"
 msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Globalsat Import"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Import"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "GPS Blams"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "GPSBlam"
+msgid "Empty selection"
 msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Add EGPX layer"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
 msgstr ""
 
-msgid "GPX Data"
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Download OSM data continuously"
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
+msgid "Download map data continuously when paning and zooming."
 msgstr ""
 
-msgid "Class element without name"
+msgid "Toggle the continuous download on/off"
 msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Activate continuous downloads at startup."
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Supress the default modal progress monitor when downloading."
 msgstr ""
 
-msgid "Tag without key"
+msgid "Download Settings"
 msgstr ""
 
-msgid "Tag without value (key is {0})"
+msgid "Settings for the continuous download."
 msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Requires restart"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Max threads"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Maximum number of boxes to download for each pan/zoom."
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Max download boxes"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Wait time (milliseconds)"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Extra download area"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "Max download area"
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "The strategy for finding what areas to request from the server."
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Download strategy"
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "Split area"
 msgstr ""
 
-msgid "<and> needs at least one child"
+msgid "Splits an area by an untagged way."
 msgstr ""
 
-msgid "<or> needs at least one child"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
 msgstr ""
 
-msgid "<not> needs at least one child"
+msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
+msgid "Coordinates imported: "
 msgstr ""
 
-msgid "Condition {0} not yet finished"
+msgid "Format errors: "
 msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "TangoGPS import success"
 msgstr ""
 
-msgid "Collection must contain at least one condition"
+msgid "TangoGPS import failure!"
 msgstr ""
 
-msgid "No ruleset has been selected!"
+msgid "TCX Files (*.tcx)"
 msgstr ""
 
-msgid "No ruleset"
+msgid "Download along..."
 msgstr ""
 
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+msgid "Download OSM data along the selected ways."
 msgstr ""
 
-msgid ""
-"File not found:\n"
-"{0}"
+msgid "Download Along"
 msgstr ""
 
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+msgid "Please select 1 or more ways to download along"
 msgstr ""
 
-msgid "File not found:\n"
+msgid "Download from OSM along selected ways"
 msgstr ""
 
-msgid "Couldn''t find built-in ruleset {0}"
+msgid "{0} intermediate nodes to download."
 msgstr ""
 
-msgid "height (m)"
+msgid "between {0} {1} and {2} {3}"
 msgstr ""
 
-msgid "width (m)"
+msgid "  adding {0} {1}"
 msgstr ""
 
-msgid "length (m)"
+msgid "EditGpx"
 msgstr ""
 
-msgid "speed (km/h)"
+msgid "Layer for editing GPX tracks"
 msgstr ""
 
-msgid "weight (t)"
+msgid "Convert to GPX layer with anonymised time"
 msgstr ""
 
-msgid "axleload (t)"
+msgid "edit gpx tracks"
 msgstr ""
 
-msgid "Bookmark name"
+msgid "Import path from GPX layer"
 msgstr ""
 
-msgid "Bookmark name already exists!"
+msgid "Drop existing path"
 msgstr ""
 
-msgid "Bookmark name must not contain ''{0}''!"
+msgid "No GPX data layer found."
 msgstr ""
 
-msgid "Access class"
+msgid "External tool error"
 msgstr ""
 
-msgid "Access class must not contain ''{0}''!"
+msgid "Error executing the script:"
 msgstr ""
 
-msgid "Access types"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
-msgid "Vehicle properties"
+msgid "exttool:{0}"
 msgstr ""
 
-msgid "Road requirements"
+msgid "External Tool: {0}"
 msgstr ""
 
-msgid "Max. incline up (%, pos.)"
+msgid "Edit tool"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go up"
+msgid "CmdLine:"
 msgstr ""
 
-msgid "Max. incline down (%, pos.)"
+msgid "External tools"
 msgstr ""
 
-msgid "Maximum incline the vehicle can go down"
+msgid "Delete tool \"{0}\"?"
 msgstr ""
 
-msgid "Surface blacklist"
+msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
+msgid "New tool..."
 msgstr ""
 
-msgid "max. tracktype grade"
+msgid "Install"
 msgstr ""
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
+msgid "Public"
 msgstr ""
 
-msgid "Change bookmark"
+msgid "Could not get server response, check logs"
 msgstr ""
 
-msgid "Edit access parameters"
+msgid "Failed to login as {0}:"
 msgstr ""
 
-msgid "Graph View Dialog"
+msgid "The server did not return user ID"
 msgstr ""
 
-msgid "Open the dialog for graph view configuration."
+msgid "Failed to get messages as {0}:"
 msgstr ""
 
-msgid "default"
+msgid "GeoChat"
 msgstr ""
 
-msgid "end nodes"
+msgid "Open GeoChat panel"
 msgstr ""
 
-msgid "incline"
+msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Ruleset:"
+msgid "Enable autologin"
 msgstr ""
 
-msgid "Parameters:"
-msgstr ""
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Coloring:"
+msgid "not logged in"
 msgstr ""
 
-msgid "Create/update graph"
+msgid "Failed to log in to GeoChat:"
 msgstr ""
 
-msgid "Graphview"
+msgid "Failed to send message:"
 msgstr ""
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
+msgid "User {0} has left"
 msgstr ""
 
-msgid "Ruleset"
+msgid "User {0} is mapping nearby"
 msgstr ""
 
-msgid "Use built-in rulesets"
+msgid "Users mapping nearby:"
 msgstr ""
 
-msgid "External ruleset directory:"
+msgid "Private chat"
 msgstr ""
 
-msgid "Select directory"
+msgid "Close tab"
 msgstr ""
 
-msgid "Vehicle"
+msgid "Clear log"
 msgstr ""
 
-msgid "Restore defaults"
+msgid "Show users on map"
 msgstr ""
 
-msgid "Visualization"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Draw directions separately"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "Node color"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "Arrow color"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "Arrowhead fill color"
+msgid "Position only"
 msgstr ""
 
-msgid "Arrowhead placement"
+msgid "Position, Time, Date, Speed"
 msgstr ""
 
-msgid "New bookmark"
+msgid "Position, Time, Date, Speed, Altitude"
 msgstr ""
 
-msgid "Really delete \"{0}\"?"
+msgid "A By Time"
 msgstr ""
 
-msgid "Bookmark deletion"
+msgid "A By Distance"
 msgstr ""
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
+msgid "B By Time"
 msgstr ""
 
-msgid "Bookmark reset"
+msgid "B By Distance"
 msgstr ""
 
-msgid "Choose node color"
+msgid "C By Time"
 msgstr ""
 
-msgid "Choose arrow color"
+msgid "C By Distance"
 msgstr ""
 
-msgid "Choose arrowhead fill color"
+msgid "Data Logging Format"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Disable data logging if speed falls below"
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Disable data logging if distance falls below"
 msgstr ""
 
-msgid "graphview default node"
+msgid "Unknown logFormat"
 msgstr ""
 
-msgid "graphview default segment"
+msgid "Port:"
 msgstr ""
 
-msgid "graphview arrowhead core"
+msgid "refresh the port list"
 msgstr ""
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
+msgid "Configure Device"
 msgstr ""
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
+msgid "Connection Error."
 msgstr ""
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
+msgid "configure the connected DG100"
 msgstr ""
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgid "delete data after import"
 msgstr ""
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
+msgid "Importing data from device."
 msgstr ""
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Importing data from DG100..."
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Error deleting data."
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "imported data from {0}"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No data found on device."
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "Connection failed."
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid "Globalsat Import"
 msgstr ""
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
-msgid "Open Imagery XML file"
+msgid "Import"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "GPS Blams"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "GPSBlam"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
 msgstr ""
 
-msgid "Change Color"
+msgid "Add EGPX layer"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "GPX Data"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "Classes element below root child level"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "Class element ({0}) outside classes element"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Class element without name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Tag element outside basetag and implication elements"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Implications element below root child level"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Tag without key"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Tag without value (key is {0})"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Closed class element while none was open"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Closed basetags while it was not open"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Closed implications while it was not open"
 msgstr ""
 
-msgid "Offset"
+msgid "Tag element inside other tag element"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "mm"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
-msgid "cm"
+msgid "Closing tag element that was not open"
 msgstr ""
 
-msgid "m"
+msgid "Invalid closing xml tag </{0}> in state {1}"
 msgstr ""
 
-msgid "km"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Unknown tag for condition: {0}"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Element must not have children: {0}"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Condition is already finished at </{0}>"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "<and> needs at least one child"
 msgstr ""
 
-msgid "Offset Information"
+msgid "<or> needs at least one child"
 msgstr ""
 
-msgid "Report this offset"
+msgid "<not> needs at least one child"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Determined right here"
+msgid "No ruleset"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Reason"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "height (m)"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "width (m)"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "length (m)"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "weight (t)"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+msgid "Bookmark name"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Access class"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Access class must not contain ''{0}''!"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Access types"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "Road requirements"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid "Normal"
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Rotate 90"
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Rotate 180"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Rotate 270"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Previous image"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Next image"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Rotate left"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "Rotate image left"
+msgid "Edit access parameters"
 msgstr ""
 
-msgid "Rotate right"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Rotate image right"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "WayPoint Image"
+msgid "default"
 msgstr ""
 
-msgid "Display non-geotagged photos"
+msgid "end nodes"
 msgstr ""
 
-msgid "Imported Images"
+msgid "incline"
 msgstr ""
 
-msgid "Import vector graphics"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Scale:"
+msgid "Parameters:"
 msgstr ""
 
-msgid "unit(s) = "
+msgid "Coloring:"
 msgstr ""
 
-msgid "Importing..."
+msgid "Create/update graph"
 msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid "Graphview"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Ruleset"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Select directory"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "POWER"
+msgid "Visualization"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Working Level"
+msgid "Node color"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "Arrow color"
 msgstr ""
 
-msgid "Level Name"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "New bookmark"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Bookmark deletion"
 msgstr ""
 
-msgid "Apply Tags"
+msgid ""
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid "Fitting"
+msgid "Bookmark reset"
 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>"
+msgid "Choose node color"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Highest Level"
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "graphview default node"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "graphview default segment"
 msgstr ""
 
-msgid "InfoMode"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "GPX info mode"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
 msgstr ""
 
 msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "Delete this"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
 msgstr ""
 
-msgid "Delete this&older"
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "km/h"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "Track name: "
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "IRS Adjustment Layer"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "this layer is no osm data layer"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "filtering ways"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "Change Color"
 msgstr ""
 
-msgid "JunctionChecking"
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "Open the junctionchecking window."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "junctions"
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Channel-Digraph creation"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "order of junction (n):"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "produce OSM-Relations: junction"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "Check "
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "Search "
+msgid "Offset"
 msgstr ""
 
-msgid "search for junctions in the channel subset"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "mm"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "cm"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "km"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
 
-msgid "The starting location was not within the bbox"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Looking for shoreline..."
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "{0} nodes so far..."
+msgid "Offset Information"
 msgstr ""
 
-msgid "Lake Walker."
+msgid "Report this offset"
 msgstr ""
 
-msgid "Lake Walker"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "Error creating cache directory: {0}"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "Tracing"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "checking cache..."
+msgid "Imagery ID"
 msgstr ""
 
-msgid "Running vertex reduction..."
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "Running Douglas-Peucker approximation..."
+msgid "Determined right here"
 msgstr ""
 
-msgid "Removing duplicate nodes..."
+msgid "Determined {0} away"
 msgstr ""
 
-msgid "Lakewalker trace"
+msgid "Reason"
 msgstr ""
 
-msgid "An unknown error has occurred"
+msgid "This entry has been reported."
 msgstr ""
 
-msgid "east"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "northeast"
+msgid "Unable to connect to the server"
 msgstr ""
 
-msgid "north"
+msgid "Store Imagery Offset..."
 msgstr ""
 
-msgid "northwest"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "west"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "southwest"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "south"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "southeast"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "coastline"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "land"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
 msgstr ""
 
-msgid "Maximum number of segments per way"
+msgid "Uploading a new offset..."
 msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
+msgid "This string should be 3 to 200 letters long."
 msgstr ""
 
-msgid "Maximum gray value to count as water (0-255)"
+msgid "Adjust imagery"
 msgstr ""
 
-msgid "Line simplification accuracy (degrees)"
+msgid "Adjust the position of the selected imagery layer"
 msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
+msgid "Please select the imagery layer to adjust."
 msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
+msgid "Start adjusting"
 msgstr ""
 
-msgid "Shift all traces to east (degrees)"
+msgid "There are currently no imagery layer to adjust."
 msgstr ""
 
-msgid "Shift all traces to north (degrees)"
+msgid "No layers to adjust"
 msgstr ""
 
-msgid "Direction to search for land"
+msgid "Normal"
 msgstr ""
 
-msgid "Tag ways as"
+msgid "Rotate 90"
 msgstr ""
 
-msgid "WMS Layer"
+msgid "Rotate 180"
 msgstr ""
 
-msgid "Maximum cache size (MB)"
+msgid "Rotate 270"
 msgstr ""
 
-msgid "Maximum cache age (days)"
+msgid "Previous image"
 msgstr ""
 
-msgid "Source text"
+msgid "Next image"
 msgstr ""
 
-msgid "Lakewalker Plugin Preferences"
+msgid "Rotate left"
 msgstr ""
 
-msgid "A plugin to trace water bodies on Landsat imagery."
+msgid "Rotate image left"
 msgstr ""
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Rotate right"
 msgstr ""
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Rotate image right"
 msgstr ""
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "WayPoint Image"
 msgstr ""
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+msgid "Display non-geotagged photos"
 msgstr ""
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Imported Images"
 msgstr ""
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgid "Import vector graphics"
 msgstr ""
 
-msgid "Offset all points in East direction (degrees). Default 0."
+msgid "SVG files [ImportVec plugin] (*.svg)"
 msgstr ""
 
-msgid "Offset all points in North direction (degrees). Default 0."
+msgid "Concourse wizard ..."
 msgstr ""
 
-msgid "Direction to search for land. Default east."
+msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgid "Vertical layer:"
 msgstr ""
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgid "Structure type:"
 msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgid "Offset into background:"
 msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Data source text. Default is Landsat."
+msgid "POWER"
 msgstr ""
 
-msgid "Downloading image tile..."
+msgid "Activates the plug-in"
 msgstr ""
 
-msgid "Could not acquire image"
+msgid "Working Level"
 msgstr ""
 
-msgid "Connection Failed"
+msgid "Selects the working level."
 msgstr ""
 
-msgid "Not connected"
+msgid "Level Name"
 msgstr ""
 
-msgid "Connecting"
+msgid "Optional name-tag for a level."
 msgstr ""
 
-msgid "Connected"
+msgid "The object preset you want to tag."
 msgstr ""
 
-msgid "no name"
+msgid "Sets the name tag when the room-object is selected."
 msgstr ""
 
-msgid "Live GPS"
+msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
-msgid "Show GPS data."
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Status"
+msgid "Fitting"
 msgstr ""
 
-msgid "Way Info"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
 msgstr ""
 
-msgid "Speed"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Course"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "LiveGPS layer"
+msgid "The lowest level of your building."
 msgstr ""
 
-msgid "Capture GPS Track"
+msgid "Highest Level"
 msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Center Once"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
+msgid "InfoMode"
 msgstr ""
 
-msgid "Auto-Center"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Open MapDust"
+msgid "Delete this"
 msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "km/h"
 msgstr ""
 
-msgid "Missing input data"
+msgid "Track name: "
 msgstr ""
 
-msgid "Mapillary Images"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
 
-msgid "Total images:"
+msgid "IRS Adjustment Layer"
 msgstr ""
 
-msgid "images"
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "this layer is no osm data layer"
 msgstr ""
 
-msgid "Mapillary"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "filtering ways"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Export images"
+msgid "JunctionChecking"
 msgstr ""
 
-msgid "Import pictures"
+msgid "Open the junctionchecking window."
 msgstr ""
 
-msgid "Import local pictures"
+msgid "junctions"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join mode"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid "Check "
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
+msgid "Search "
 msgstr ""
 
-msgid "Upload Mapillary pictures"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
-msgid "No entry"
+msgid "The starting location was not within the bbox"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Looking for shoreline..."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "{0} nodes so far..."
 msgstr ""
 
-msgid "Uneven road"
+msgid "Lake Walker."
 msgstr ""
 
-msgid "No parking"
+msgid "Lake Walker"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Error creating cache directory: {0}"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Tracing"
 msgstr ""
 
-msgid "No turn"
+msgid "checking cache..."
 msgstr ""
 
-msgid "Years"
+msgid "Running vertex reduction..."
 msgstr ""
 
-msgid "Months"
+msgid "Running Douglas-Peucker approximation..."
 msgstr ""
 
-msgid "Days"
+msgid "Removing duplicate nodes..."
 msgstr ""
 
-msgid "Imported images"
+msgid "Lakewalker trace"
 msgstr ""
 
-msgid "Mapillary filter"
+msgid "An unknown error has occurred"
 msgstr ""
 
-msgid "Open Mapillary filter dialog"
+msgid "east"
 msgstr ""
 
-msgid "Not older than: "
+msgid "northeast"
 msgstr ""
 
-msgid "Downloaded images"
+msgid "north"
 msgstr ""
 
-msgid "Only images with signs"
+msgid "northwest"
 msgstr ""
 
-msgid "Choose signs"
+msgid "west"
 msgstr ""
 
-msgid "Mapillary history"
+msgid "southwest"
 msgstr ""
 
-msgid "Open Mapillary history dialog"
+msgid "south"
 msgstr ""
 
-msgid "Mapillary picture"
+msgid "southeast"
 msgstr ""
 
-msgid "Open Mapillary window"
+msgid "coastline"
 msgstr ""
 
-msgid "Mapillary dialog"
+msgid "land"
 msgstr ""
 
-msgid "Open Mapillary main dialog"
+msgid "Maximum number of segments per way"
 msgstr ""
 
-msgid "Next picture"
+msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-msgid "Shows the next picture in the sequence"
+msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-msgid "Previous picture"
+msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-msgid "Shows the previous picture in the sequence"
+msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-msgid "Jump to red"
+msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the red line"
+msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-msgid "Jump to blue"
+msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-msgid "Jumps to the picture at the other side of the blue line"
+msgid "Direction to search for land"
 msgstr ""
 
-msgid "Stops the walk."
+msgid "Tag ways as"
 msgstr ""
 
-msgid "Play"
+msgid "WMS Layer"
 msgstr ""
 
-msgid "Continues with the paused walk."
+msgid "Maximum cache size (MB)"
 msgstr ""
 
-msgid "Pause"
+msgid "Maximum cache age (days)"
 msgstr ""
 
-msgid "Pauses the walk."
+msgid "Source text"
 msgstr ""
 
-msgid "Display hour when the picture was taken"
+msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-msgid "Use 24 hour format"
+msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-msgid "Move to picture''s location with next/previous buttons"
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-msgid "Preview images when hovering its icon"
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
 msgstr ""
 
-msgid "Download mode"
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
 msgstr ""
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
-msgid "You are currently not logged in."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-msgid "Go to setting and log in to Mapillary before uploading."
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-msgid "Upload selected sequence"
+msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-msgid "Delete after upload"
+msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-msgid "Wait for full quality pictures"
+msgid "Direction to search for land. Default east."
 msgstr ""
 
-msgid "Follow selected image"
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-msgid "Go forward"
+msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr ""
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr ""
 
-msgid "2 images joined"
+msgid "Data source text. Default is Landsat."
 msgstr ""
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr ""
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr ""
 
-msgid "2 images unjoined"
+msgid "Connection Failed"
 msgstr ""
 
-msgid "everything in the visible area"
+msgid "Not connected"
 msgstr ""
 
-msgid "areas with downloaded OSM-data"
+msgid "Connecting"
 msgstr ""
 
-msgid "only when manually requested"
+msgid "Connected"
 msgstr ""
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
+msgid "no name"
 msgstr ""
 
-msgid "Downloading"
+msgid "Live GPS"
 msgstr ""
 
-msgid "Select mode"
+msgid "Show GPS data."
 msgstr ""
 
-msgid "Mapillary login"
+msgid "Status"
 msgstr ""
 
-msgid "Login successful, return to JOSM."
+msgid "Way Info"
 msgstr ""
 
-msgid "Supported image formats (JPG and PNG)"
+msgid "Speed"
 msgstr ""
 
-msgid "Downloading Mapillary images"
+msgid "Course"
 msgstr ""
 
-msgid "Total Mapillary images: {0}"
+msgid "LiveGPS layer"
 msgstr ""
 
-msgid "Submitting Mapillary Changeset"
+msgid "Capture GPS Track"
 msgstr ""
 
-msgid "No images found"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-msgid "Finished upload"
+msgid "Center Once"
 msgstr ""
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
+msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "Not Logged in to Mapillary"
+msgid "Auto-Center"
 msgstr ""
 
-msgid "Uploading: {0}"
+msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-msgid "The image key ''{0}'' is invalid!"
+msgid "Open MapDust"
 msgstr ""
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
+msgid "Missing input data"
 msgstr ""
 
 msgid "Measured values"
@@ -29626,6 +29768,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr ""
 
@@ -29721,9 +29866,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30735,6 +30877,66 @@ msgstr ""
 msgid "Terrace"
 msgstr ""
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31182,6 +31384,84 @@ msgstr ""
 msgid "Create a new signing key"
 msgstr ""
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr ""
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32008,9 +32288,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32204,15 +32481,9 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr ""
-
 msgid "jumps n sec back"
 msgstr ""
 
-msgid "Forward"
-msgstr ""
-
 msgid "jumps n sec forward"
 msgstr ""
 
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index 309a8e2..e72e666 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: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-06-15 19:24+0000\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-10-23 14:49+0000\n"
 "Last-Translator: mmyfl <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: 2016-09-06 05:48+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:17+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: zh_CN\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -205,18 +205,6 @@ msgstr "在地图上设定选定的元件为上列列表中选定的项目。"
 msgid "Add imagery layer {0}"
 msgstr "添加图像层 {0}"
 
-msgid "Error"
-msgstr "错误"
-
-msgid "Select image format for WMS layer"
-msgstr "为 WMS 图层选择图像格式"
-
-msgid "Select WMS layers"
-msgstr "选择 WMS 图层"
-
-msgid "Add layers"
-msgstr "添加图层"
-
 msgid "Invalid service URL."
 msgstr "无效的服务 URL。"
 
@@ -229,6 +217,18 @@ msgstr "无法得到 WMS 图层列表。"
 msgid "Could not parse WMS layer list."
 msgstr "无法解析 WMS 图层列表。"
 
+msgid "Error"
+msgstr "错误"
+
+msgid "Select image format for WMS layer"
+msgstr "为 WMS 图层选择图像格式"
+
+msgid "Select WMS layers"
+msgstr "选择 WMS 图层"
+
+msgid "Add layers"
+msgstr "添加图层"
+
 msgid "Add Node..."
 msgstr "添加节点..."
 
@@ -471,10 +471,10 @@ msgid "Download notes in current view"
 msgstr "在当前视图中下载笔记"
 
 msgid "Download in current view"
-msgstr ""
+msgstr "在当前视图中下载"
 
 msgid "Download map data from the OSM server in current view"
-msgstr ""
+msgstr "在当前视图中从 OSM 服务器下载地图数据"
 
 msgid "Download object..."
 msgstr "下载对象..."
@@ -1767,7 +1767,7 @@ msgid "Errors during download"
 msgstr "下载时发生错误"
 
 msgid "Download Geo URL"
-msgstr ""
+msgstr "下载 Geo URL"
 
 msgid "Download GPS"
 msgstr "下载 GPS"
@@ -3272,9 +3272,6 @@ msgstr "矩阵集标识符"
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "getCapabilities 文档未定义图层:{0}"
 
-msgid "No layer selected"
-msgstr "未选择图层"
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr "WMT S解析器错误 - 开始元素 {0} 与结束元素 {2} 名称不同"
@@ -3675,12 +3672,12 @@ msgstr "多重相关街道关系"
 msgid "House number without street"
 msgstr "没有街道的门牌号"
 
-msgid "House number ''{0}'' duplicated"
-msgstr "门牌号“{0}”重复"
-
 msgid "Duplicate house numbers"
 msgstr "重复的门牌号"
 
+msgid "House number ''{0}'' duplicated"
+msgstr "门牌号“{0}”重复"
+
 msgid "Multiple street names in relation"
 msgstr "关系中的多重街道名称"
 
@@ -3715,6 +3712,9 @@ msgstr "海岸线"
 msgid "This test checks that coastlines are correct."
 msgstr "这会测试海岸线是否正确。"
 
+msgid "Reversed coastline: land not on left side"
+msgstr "反转的海岸线:陆地不在左侧"
+
 msgid "Unconnected coastline"
 msgstr "未连接的海岸线"
 
@@ -3724,6 +3724,9 @@ msgstr "未排序的海岸线"
 msgid "Reversed coastline"
 msgstr "反方向的海岸线"
 
+msgid "invalid coastline"
+msgstr "无效的海岸线"
+
 msgid "Conditional Keys"
 msgstr "条件键"
 
@@ -3760,6 +3763,12 @@ msgstr "边界交叉"
 msgid "Crossing barriers"
 msgstr "障碍交叉"
 
+msgid "Self crossing"
+msgstr "自我相交"
+
+msgid "Self-crossing ways"
+msgstr "自我相交的路径"
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3977,6 +3986,12 @@ msgstr "多重多边形成员没有有用的角色"
 msgid "Non-Way in multipolygon"
 msgstr "多重多边形内没有路径"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "缺少 name:* 翻译"
 
@@ -4191,30 +4206,30 @@ msgstr "属性数值含有多重空白字符"
 msgid "Property values contain HTML entity"
 msgstr "属性数值含有 HTML 标记"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "键“{0}”类似“{1}”。"
-
 msgid "Misspelled property key"
 msgstr "拼写错误的属性键"
 
-msgid "Key ''{0}'' not in presets."
-msgstr "键“{0}”不在预设组合中。"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr "键“{0}”类似“{1}”。"
 
 msgid "Presets do not contain property key"
 msgstr "预设组合不包含属性键值"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "键“{1}”的值“{0}”像“{2}”。"
+msgid "Key ''{0}'' not in presets."
+msgstr "键“{0}”不在预设组合中。"
 
 msgid "Misspelled property value"
 msgstr "拼写错误的属性值"
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "键“{1}”的值“{0}”不在预设组合中。"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr "键“{1}”的值“{0}”像“{2}”。"
 
 msgid "Presets do not contain property value"
 msgstr "预设组合不包含属性数值"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "键“{1}”的值“{0}”不在预设组合中。"
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4458,9 +4473,6 @@ msgstr "错误排序的路径"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "这个测试会检查水域、陆地和海岸线路径的方向。"
 
-msgid "Reversed coastline: land not on left side"
-msgstr "反转的海岸线:陆地不在左侧"
-
 msgid "Reversed land: land not on left side"
 msgstr "反转的陆地:陆地不在左侧"
 
@@ -4713,7 +4725,7 @@ msgid "Make sure you load some data if you use --selection."
 msgstr "如果您使用 --selection,请确定已加载了一些数据。"
 
 msgid "Log level is at {0} ({1}, {2})"
-msgstr ""
+msgstr "日志级别为 {0} ({1},{2})"
 
 msgid "Plugin loading skipped"
 msgstr "已跳过插件加载"
@@ -4980,9 +4992,6 @@ msgstr "鼠标指针所在的地理经度。"
 msgid "System of measurement changed to {0}"
 msgstr "测量系统更改为 {0}"
 
-msgid "Layer not in list."
-msgstr "图层不在列表中。"
-
 msgid "Default (open, closed, new)"
 msgstr "默认(开启,关闭,新建)"
 
@@ -6412,6 +6421,9 @@ msgstr "排序笔记"
 msgid "Sort"
 msgstr "排序"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "对象类型:"
 
@@ -6653,6 +6665,14 @@ msgstr "下载修改集合内容"
 msgid "Download the content of the selected changesets from the server"
 msgstr "从服务器下载关于已选定修改集合的内容"
 
+msgid "Download changed objects"
+msgstr "下载已更改的对象"
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr "下载所选修改集合中已更改对象的当前版本"
+
 msgid "My changesets"
 msgstr "我的修改集合"
 
@@ -7924,9 +7944,6 @@ msgstr "输入要查找的位置名称"
 msgid "Areas around places"
 msgstr "在位置附近的区域"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "空指针异常,可能遗漏某些标签。"
-
 msgid "Search ..."
 msgstr "查找..."
 
@@ -8505,6 +8522,9 @@ msgstr "未保存的修改 - 是否在结束前保存/上传?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "未保存的修改 - 是否在删除前保存/上传?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr "未保存的更改 - 是否在重新启动前保存/上传?"
+
 msgid "Uploading and saving modified layers ..."
 msgstr "正在上传与保存修改过的图层 ..."
 
@@ -8555,6 +8575,12 @@ msgstr "现在退出!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "不保存就退出 JOSM。未保存的修改会丢失。"
 
+msgid "Restart now!"
+msgstr "现在重启!"
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr "重新启动 JOSM 而不保存。 未保存的更改将丢失。"
+
 msgid "Delete now!"
 msgstr "立即删除!"
 
@@ -8567,6 +8593,12 @@ msgstr "在退出前执行操作"
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr "保存后结束 JOSM。未保存的修改会上传和/或保存。"
 
+msgid "Perform actions before restarting"
+msgstr "在重新启动之前执行操作"
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr "重新启动 JOSM 并保存。未保存的更改将上传/保存。"
+
 msgid "Perform actions before deleting"
 msgstr "在删除前执行操作"
 
@@ -10669,6 +10701,9 @@ msgstr "绘出单行道箭头。"
 msgid "Draw segment order numbers"
 msgstr "绘制区段顺序编号"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "绘出已下载数据的边界"
 
@@ -12766,6 +12801,9 @@ msgstr "NMEA 导入成功:"
 msgid "NMEA import failure!"
 msgstr "NMEA 导入失败!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "空指针异常,可能遗漏某些标签。"
+
 msgid "Note Files"
 msgstr "笔记文件"
 
@@ -13128,6 +13166,9 @@ msgstr "正在上传数据..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "发现意外的 id 0 osm 原型"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr "正在下载数据..."
 
@@ -14792,6 +14833,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14903,7 +14947,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15082,6 +15129,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15376,18 +15426,6 @@ msgstr "Freemap.sk 自行车"
 msgid "Freemap.sk Ski"
 msgstr "Freemap.sk 滑雪"
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15397,6 +15435,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15529,6 +15570,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15898,6 +15942,9 @@ msgstr "这个插件可以将 JOSM 中目前使用的图层 GPS 轨迹直接上
 msgid "Downloads OSM data along a way"
 msgstr "沿着一条路径下载 OSM 数据"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -16012,6 +16059,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "帮助将 WMS 图片矢量化。"
 
@@ -16209,6 +16259,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "让连栋房屋能超出单一区块。"
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr "集成 http://osmlab.github.io/to-fix/ 的补丁到 JOSM,以修复 OpenStreetMap 中的错误"
@@ -16231,6 +16286,9 @@ msgstr "在地图上描出绘制建筑物和其他形状。需要运行 Tracer2S
 msgid "Plugin to digital sign OSM-Data"
 msgstr "用来数字签名 OSM-数据的插件"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr "提供一个简单的图形界面,用来添加、编辑和删除转弯车道。"
@@ -16387,6 +16445,10 @@ msgid "No wheeled vehicle"
 msgstr "不可通过轮式车辆"
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "场地"
 
@@ -17707,6 +17769,9 @@ msgstr "在建"
 msgid "Ford"
 msgstr "浅滩"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "路径"
 
@@ -19326,6 +19391,9 @@ msgstr "跑道"
 msgid "Taxiway"
 msgstr "滑行道"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "直升机停机坪"
 
@@ -19996,11 +20064,11 @@ msgstr "地点编号"
 msgid "Point Name"
 msgstr "地点名"
 
-msgid "Phone Number"
-msgstr "电话号码"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(使用国际码,像是 +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "兽医"
@@ -20014,6 +20082,12 @@ msgstr "急救站"
 msgid "Automated Defibrillator"
 msgstr "自动除颤器"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "电话号码"
+
 msgid "Located inside a building?"
 msgstr "位于建筑物内?"
 
@@ -20883,6 +20957,10 @@ msgid "university"
 msgstr "大学"
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr "医院"
 
@@ -20967,6 +21045,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr "层数"
 
@@ -23172,7 +23254,13 @@ msgstr "自然保护区"
 msgid "Scree"
 msgstr "碎石坡"
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23839,16 +23927,10 @@ msgstr "线路"
 msgid "Bicycle Route"
 msgstr "自行车线路"
 
-msgid "icn"
-msgstr ""
-
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
+msgid "national"
 msgstr ""
 
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23857,18 +23939,6 @@ msgstr "山地自行车路线"
 msgid "Hiking Route"
 msgstr "远足路线"
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23881,18 +23951,6 @@ msgstr "步行路线"
 msgid "Riding Route"
 msgstr "骑行路线"
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr "滑雪路线"
 
@@ -24085,9 +24143,20 @@ msgstr "偶地址插值中的奇门牌号。"
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr "{0} 没有 {1}"
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr "{0} 没有 {1} 或 {2}"
 
@@ -24097,6 +24166,12 @@ msgstr "{0} 没有 {1}、{2} 或 {3}"
 msgid "{0} together with {1}"
 msgstr "{0} 带有 {1}"
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr "不完整的对象:只有 {0}"
 
@@ -24112,39 +24187,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr "{0} 在可疑对象上"
 
-msgid "restaurant without name"
-msgstr "没有名称的餐厅"
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24163,9 +24223,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} 已过时"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24220,10 +24289,16 @@ msgstr "不具体的标签 {0}"
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr "键值中的生僻字符"
 
@@ -24239,7 +24314,7 @@ msgstr "{0} 已被 {1} 取代"
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr "{0} 已过时。应使用 {1}: 键值前缀。"
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24284,8 +24359,8 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr "重叠的相同土地用途"
 
-msgid "{0} must be connected to a way"
-msgstr "{0} 必须与路径相连"
+msgid "isolated node which must be connected to a way"
+msgstr ""
 
 msgid "node connects waterway and bridge"
 msgstr ""
@@ -24318,6 +24393,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr "缩写的街道名称"
 
@@ -24336,6 +24414,9 @@ msgstr "没有编号的公路"
 msgid "temporary highway type"
 msgstr "临时公路类型"
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr "街道名称中含有 ss"
 
@@ -24426,11 +24507,14 @@ msgstr "未知犹太教教派"
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
-msgstr "{0}={1} 无意义"
+msgid "{0} makes no sense"
+msgstr ""
 
 msgid "Nodes duplicating parent way tags"
 msgstr "节点重复父路径的标签"
@@ -24678,6 +24762,27 @@ msgstr "正在上传 GPX 轨迹"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "上传轨迹至 openstreetmap.org"
 
+msgid "Importing..."
+msgstr "正在导入..."
+
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
+msgid "Import dxf"
+msgstr ""
+
+msgid "Scale:"
+msgstr "比例:"
+
+msgid "unit(s) = "
+msgstr "单位 = "
+
+msgid "m"
+msgstr "米"
+
 msgid "Shows elevation profile"
 msgstr "显示海拔轮廓"
 
@@ -25021,3384 +25126,3421 @@ msgstr "导入地理参照图像"
 msgid "Error while creating image layer: "
 msgstr "创建图像图层时发生错误: "
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
-msgstr ""
+msgid "Total images:"
+msgstr "总图像:"
 
-msgid "Correlate with GPX..."
-msgstr "与 GPX 关联..."
+msgid "images"
+msgstr "图像"
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
-msgstr "保存图层..."
+msgid "Mapillary"
+msgstr ""
 
-msgid "Save NanoLog layer"
-msgstr "保存 NanoLog 图层"
+msgid "Create Mapillary layer"
+msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
-msgstr "打开 NanoLog 文件..."
+msgid "Download Mapillary images in current view"
+msgstr ""
 
-msgid "Could not read NanoLog file:"
-msgstr "无法读取 NanoLog 文件:"
-
-msgid "OSM Recommendation"
-msgstr "OSM 建议"
+msgid "Export pictures"
+msgstr "导出图片"
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Training process configuration"
-msgstr ""
+msgid "Export images"
+msgstr "导出图像"
 
-msgid "Model Settings"
-msgstr "模型设置"
+msgid "Import pictures"
+msgstr "导入图片"
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import local pictures"
+msgstr "导入本地图片"
+
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
-msgstr "添加建议"
+msgid "Select pictures"
+msgstr "选择图片"
 
-msgid "Add a recommended key/value pair to your object"
-msgstr "添加建议的键/值对到您的对象"
+msgid "Import pictures into sequence"
+msgstr ""
 
-msgid "Train a Model"
-msgstr "训练模型"
+msgid "Import pictures into Mapillary layer in a sequence"
+msgstr ""
 
-msgid "Start the training engine!"
-msgstr "启动训练机!"
+msgid "Join mode"
+msgstr ""
 
-msgid "Edit opening hours"
-msgstr "编辑开放时间"
+msgid "Join/unjoin pictures"
+msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
-msgstr "在图形界面中编辑选定元素的时间标签"
+msgid "Join Mapillary pictures"
+msgstr ""
 
-msgid "edit existing tag"
-msgstr "编辑现有的标签"
+msgid "Submit changeset"
+msgstr ""
 
-msgid "edit new tag"
-msgstr "编辑新的标签"
+msgid "Submit the current changeset"
+msgstr ""
 
-msgid "Display clock in 12h mode."
-msgstr "以 12 小时模式显示时钟。"
+msgid "Submit the current changeset to Mapillary"
+msgstr ""
 
-msgid "Choose key"
-msgstr "选择属性键"
+msgid "Upload pictures"
+msgstr "上传图片"
 
-msgid "apply {0}"
-msgstr "应用 {0}"
+msgid "Upload Mapillary pictures"
+msgstr ""
 
-msgid "There is something wrong in the value near:"
-msgstr "有错误发生于数值附近:"
+msgid "Upload pictures."
+msgstr "上传图片。"
 
-msgid "Info: {0}"
-msgstr "信息:{0}"
+msgid "Walk mode"
+msgstr ""
 
-msgid "Correct the value manually and than press Enter."
-msgstr "手动修改数值, 然后按回车"
+msgid "Start walk mode"
+msgstr ""
 
-msgid "Error in timeformat"
-msgstr "错误的时间格式"
+msgid "Zoom to selected image"
+msgstr "缩放至选定图片"
 
-msgid "open end"
-msgstr "开放结束"
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
-msgstr "导入 OSM 检查器错误..."
+msgid "View in website"
+msgstr ""
 
-msgid "OsmInspector"
-msgstr "OSM 检查器"
+msgid "Copy key"
+msgstr ""
 
-msgid "Open OsmInspector"
-msgstr "打开 OSM 检查器"
+msgid "Copy key tag"
+msgstr ""
 
-msgid "OsmBugInfo"
-msgstr "OsmBugInfo"
+msgid "Edit on website"
+msgstr "在网站上编辑"
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
-msgstr "前一 OSMI 错误"
+msgid "Mapillary changeset"
+msgstr ""
 
-msgid "Next OSMI bug"
-msgstr "后一 OSMI 错误"
+msgid "Submit"
+msgstr ""
 
-msgid "OSM Inspector Bugs"
-msgstr "OSM 检查器错误"
+msgid "Export all images"
+msgstr "导出所有图像"
 
-msgid "Selected Bug Info"
-msgstr "选定错误的信息"
+msgid "Export selected sequence"
+msgstr ""
 
-msgid "Handy Address Interpolation Functions"
-msgstr "简便的地址编排函数"
+msgid "Export selected images"
+msgstr "导出选定图像"
 
-msgid "Define Address Interpolation"
-msgstr "已定义的地址编排规则"
+msgid "Rewrite imported images"
+msgstr "重写已导入图像"
 
-msgid "Odd"
-msgstr "奇数"
+msgid "Select a folder"
+msgstr ""
 
-msgid "Even"
-msgstr "偶数"
+msgid "Explore"
+msgstr ""
 
-msgid "Alphabetic"
-msgstr "字母"
+msgid "Select a directory"
+msgstr "选择文件夹"
 
-msgid "Numeric"
-msgstr "数字"
+msgid "Speed limit"
+msgstr "限速"
 
-msgid "Actual"
-msgstr "实际"
+msgid "Give way"
+msgstr ""
 
-msgid "Estimate"
-msgstr "估计"
+msgid "No entry"
+msgstr ""
 
-msgid "Potential"
-msgstr "潜在"
+msgid "Intersection danger"
+msgstr ""
 
-msgid "Relation: {0}"
-msgstr "关系:{0}"
+msgid "Mandatory direction (any)"
+msgstr ""
 
-msgid "Associate with street using:"
-msgstr "与街道关联的方式:"
+msgid "Uneven road"
+msgstr ""
 
-msgid "Numbering Scheme:"
-msgstr "编号规则:"
+msgid "No parking"
+msgstr ""
 
-msgid "Increment:"
-msgstr "递增:"
+msgid "No overtaking"
+msgstr ""
 
-msgid "Starting #:"
-msgstr "开始 #:"
+msgid "Pedestrian crossing"
+msgstr ""
 
-msgid "Ending #:"
-msgstr "结尾 #:"
+msgid "No turn"
+msgstr ""
 
-msgid "Accuracy:"
-msgstr "准确度:"
+msgid "Years"
+msgstr ""
 
-msgid "Convert way to individual house numbers."
-msgstr "将路径转换为个别的房屋号码。"
+msgid "Months"
+msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
-msgstr "将关联 {0} 个额外的房屋号码节点"
+msgid "Days"
+msgstr ""
 
-msgid "City:"
-msgstr "城市:"
+msgid "Imported images"
+msgstr "已导入图像"
 
-msgid "State:"
-msgstr "状态:"
+msgid "Mapillary filter"
+msgstr ""
 
-msgid "Post Code:"
-msgstr "邮政编码:"
+msgid "Open Mapillary filter dialog"
+msgstr ""
 
-msgid "Country:"
-msgstr "国家:"
+msgid "Not older than: "
+msgstr ""
 
-msgid "Full Address:"
-msgstr "完整地址:"
+msgid "Downloaded images"
+msgstr "已下载图像"
 
-msgid "Optional Information:"
-msgstr "选择性的信息:"
+msgid "Only images with signs"
+msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
-msgstr "请选择一个街道和地址插值方法关联"
+msgid "Choose signs"
+msgstr ""
 
-msgid "Please select address interpolation way for this street"
-msgstr "请为这条街道选择地址插值方法"
+msgid "Mapillary history"
+msgstr ""
 
-msgid "Expected odd numbers for addresses"
-msgstr "预测的奇数地址"
+msgid "Open Mapillary history dialog"
+msgstr ""
 
-msgid "Expected even numbers for addresses"
-msgstr "预测的偶数地址"
+msgid "Mapillary picture"
+msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
-msgstr "国码只能使用 2 个字节"
+msgid "Mapillary dialog"
+msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
-msgstr "请输入开始与结尾地址的有效编号"
+msgid "Open Mapillary main dialog"
+msgstr ""
 
-msgid "Alphabetic address must end with a letter"
-msgstr "字母住址必须以字母结尾"
+msgid "Next picture"
+msgstr "前一图片"
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
-msgstr "开始与结尾的编号必须属于同一个字母地址"
+msgid "Shows the next picture in the sequence"
+msgstr ""
 
-msgid "Starting address letter must be less than ending address letter"
-msgstr "开始住址的字母必须少于结尾住址的字母"
+msgid "Previous picture"
+msgstr "后一图片"
 
-msgid "Please enter valid number for starting address"
-msgstr "请输入开始住址的有效数字"
+msgid "Shows the previous picture in the sequence"
+msgstr ""
 
-msgid "Please enter valid number for ending address"
-msgstr "请输入结尾住址的有效数字"
+msgid "Jump to red"
+msgstr ""
 
-msgid "Starting address number must be less than ending address number"
-msgstr "开始住址的数字必须少于结尾住址的数字"
+msgid "Jumps to the picture at the other side of the red line"
+msgstr ""
 
-msgid "Align Way Segments"
-msgstr "对齐路径区段"
+msgid "Jump to blue"
+msgstr ""
 
-msgid "Align Ways"
-msgstr "对齐路径"
+msgid "Jumps to the picture at the other side of the blue line"
+msgstr ""
 
-msgid ""
-"Please select two segments that don''t share any nodes.\n"
-"Alternatively put the pivot on their common node.\n"
+msgid "Stops the walk."
 msgstr ""
 
-msgid ""
-"Aligning would result nodes ''outside the world''.\n"
-"Alignment not possible.\n"
+msgid "Play"
+msgstr "播放"
+
+msgid "Continues with the paused walk."
 msgstr ""
 
-msgid ""
-"There is at least a non-pivot endpoint of the alignee that joins more than "
-"two way segments.\n"
-"Preserved angles type alignment is not possible.\n"
+msgid "Pause"
+msgstr "暂停"
+
+msgid "Pauses the walk."
 msgstr ""
 
-msgid ""
-"The alignment is not possible with maintaining the angles of the joint "
-"segments.\n"
-"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgid "Display hour when the picture was taken"
 msgstr ""
 
-msgid ""
-"An intersection point would fall outside its adjacent nodes.\n"
-"This is an unsupported scenario.\n"
+msgid "Use 24 hour format"
 msgstr ""
 
-msgid "Undocumented problem occured.\n"
+msgid "Move to picture''s location with next/previous buttons"
 msgstr ""
 
-msgid "AlignWayS: Alignment not possible"
-msgstr "AlignWayS:无法进行对齐"
+msgid "Preview images when hovering its icon"
+msgstr ""
 
-msgid "Align way segment"
-msgstr "对齐路径区段"
+msgid "Login"
+msgstr "登录"
 
-msgid ""
-"Please select two segments that don''t share any nodes\n"
-" or put the pivot on their common node.\n"
+msgid "Logout"
+msgstr "注销"
+
+msgid "Download mode"
 msgstr ""
-"请选择两个没有共用任何节点的区段,\n"
-"或在它们的共通节点上放置中心轴。\n"
 
-msgid "Align Way Segments: Modes"
-msgstr "对齐路径区段:模式"
+msgid "You are logged in as ''{0}''."
+msgstr "您已登录为“{0}”。"
 
-msgid "Align Ways control panel"
-msgstr "对齐路径控制面板"
+msgid "You are currently not logged in."
+msgstr "您尚未登录。"
 
-msgid "This panel activates in Align Ways mode:"
-msgstr "此面板在对齐路径模式中激活:"
+msgid "Go to setting and log in to Mapillary before uploading."
+msgstr ""
 
-msgid "Length preserved"
-msgstr "保留长度"
+msgid "Upload selected sequence"
+msgstr ""
 
-msgid "Angle preserved"
-msgstr "保留角度"
+msgid "Delete after upload"
+msgstr "上传后删除"
 
-msgid "Align with:"
-msgstr "对齐:"
+msgid "Wait for full quality pictures"
+msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that its length is "
-"preserved.</html>"
+msgid "Follow selected image"
 msgstr ""
 
-msgid ""
-"<html>Aligns the way segment to the reference so that the angles of its "
-"adjacent segments are preserved.<br/>The length of the aligned segment is "
-"likely to change as result.</html>"
+msgid "Go forward"
 msgstr ""
 
-msgid "I''m ready!"
-msgstr "准备就绪!"
+msgid "Deleted {0} image"
+msgid_plural "Deleted {0} images"
+msgstr[0] "已删除 {0} 张图像"
 
-msgid "AlignWays Tips"
-msgstr "AlignWays 技巧"
+msgid "Imported {0} image"
+msgid_plural "Imported {0} images"
+msgstr[0] "已导入 {0} 张图像"
 
-msgid "AlignWays: What''s New..."
-msgstr "AlignWays:新功能..."
+msgid "2 images joined"
+msgstr ""
 
-msgid "Align Ways mode"
-msgstr "对齐路径模式"
+msgid "Moved {0} image"
+msgid_plural "Moved {0} images"
+msgstr[0] "已移动 {0} 张图像"
 
-msgid "Parameter ''{0}'' must not be null"
-msgstr "参数“{0}”不能为空"
+msgid "Turned {0} image"
+msgid_plural "Turned {0} images"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
+msgid "2 images unjoined"
 msgstr ""
-"要对齐的区段不能和参考用区段是同一个。\n"
-"请选择不同的区段来对齐。"
 
-msgid "AlignWayS message"
-msgstr "AlignWayS 信息"
+msgid "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
 
 msgid ""
-"Reference segment cannot be the same with the segment to be aligned.\n"
-"Please choose a different reference segment."
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
 msgstr ""
-"参考用区段不能和要对齐的区段是同一个。\n"
-"请选择不同的参考区段。"
 
-msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgid "Downloading"
+msgstr "正在下载"
+
+msgid "Select mode"
 msgstr ""
 
-msgid ": Align segments; Alt-click: Clear selection"
+msgid "Mapillary login"
 msgstr ""
 
-msgid ""
-"Ctrl-click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Login successful, return to JOSM."
+msgstr "登录成功,返回 JOSM。"
+
+msgid "Supported image formats (JPG and PNG)"
 msgstr ""
 
-msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgid "Downloading Mapillary images"
 msgstr ""
 
-msgid ""
-"Ctrl-Click: select reference way segment; Click: select way segment to be "
-"aligned"
+msgid "Total Mapillary images: {0}"
 msgstr ""
 
-msgid ""
-"Welcome to the</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> Plugin<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgid "Submitting Mapillary Changeset"
 msgstr ""
-"欢迎使用</span><br>\n"
-"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span> 插件<br>\n"
-"</span><span style=\"font-size: medium;\"><br>\n"
-"...或者应该被称为<br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> 插件..."
 
-msgid ""
-"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
-"help you to align two way segments. This can be handy when for instance\n"
-"you sketch the outlines of a building and want its side to be parallel\n"
-"with a street or road.<br>\n"
-"<br>\n"
-"Some tips may help before you start:\n"
-"</p>\n"
-"</html>\n"
-"\n"
+msgid "No images found"
+msgstr "没有找到图像"
+
+msgid "You have successfully uploaded {0} images to mapillary.com"
 msgstr ""
-"<html>\n"
-"<p style=\"font-family:sans-serif; font-weight:bold;\">AlignWays 会帮助您对齐两个\n"
-"路径区段。举例来说,当您在描绘建筑物的\n"
-"轮廓而且希望它的边缘和街道或道路平行\n"
-"时会很有帮助。<br>\n"
-"<br>\n"
-"在您开始前有些技巧可能有所帮助:\n"
-"</p>\n"
-"</html>\n"
-"\n"
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family: sans-serif;\">\n"
-"<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
-"on a segment. The other, to be aligned segment will become parallel to\n"
-"this one. </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Finished upload"
 msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif;\">\n"
-"<ul>\n"
-"<li><b>选择一个参考区段。</b> 要这么做您可以按<b><i><span style=\"color:green\">Ctrl-"
-"点击</span></i></b>\n"
-"一个区段。而另一个,要被对齐的区段就会变得跟这个区段\n"
-"平行。</li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
-"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
-"segment. \n"
-"The rotation pivot will be highlighted by default in the centre of the "
-"segment.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "You are not logged in, please log in to Mapillary in the preferences"
 msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>选择要对齐的区段。</b>您可以通过简单地<b><i><span "
-"style=\"color:green\">点击</span></i></b>这个不同的区段。\n"
-"默认情况下,旋转支点将突出在该区段的中心。\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
-"parallel with the reference segment, the to be aligned segment will rotate "
-"around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Not Logged in to Mapillary"
 msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li>可选<b>改变旋转支点。</b>为了与参考区段平行,要对齐的区段将绕这一点旋转。您可以通过在附近<b><i><span "
-"style=\"color:green\">点击</span></i></b>,以选择区段的两个端点或中心。\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "Uploading: {0}"
 msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>对齐区段。</b>按<b><i><span "
-"style=\"color:green\">{0}</span></i></b>。另外您可以在<b>工具</b>\n"
-"目录中找到命令行,或是希望将此动作放在<b>工具栏</b>上\n"
-"。\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
 
-msgid ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> There is an easy way to start over your selections if you "
-"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
-"on the map.\n"
-"</div>\n"
-"</html>\n"
-"\n"
+msgid "The image key ''{0}'' is invalid!"
 msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<b>最后提示:</b> 如果您想要重新开始选择,有一个很简单的方法:<b><i><span style=\"color:green\">Alt-"
-"点击</span></i></b>地图的某个地方。\n"
-"</div>\n"
-"</html>\n"
-"\n"
-
-msgid "Don''t show this again"
-msgstr "不要再次显示这个信息"
-
-msgid "What''s new..."
-msgstr "新功能..."
 
-msgid "Added <b>angle preserving</b> aligning mode"
+msgid "The image key must not be null here!"
 msgstr ""
 
-msgid "Various improvements and bugfixes"
-msgstr "各种改进和错误修正"
-
-msgid "Errr..."
-msgstr "囧..."
-
-msgid "Browser not supported."
-msgstr "浏览器不支持。"
-
-msgid "Building address"
-msgstr "建筑地址"
-
-msgid "empty"
-msgstr "空"
-
-msgid "skip"
-msgstr "跳过"
-
-msgid "House number:"
-msgstr "门牌号码:"
-
-msgid "Street:"
-msgstr "街道:"
-
-msgid "Post code:"
-msgstr "邮编:"
-
-msgid "Building:"
+msgid "The sequence key ''{0}'' is invalid!"
 msgstr ""
 
-msgid "Tags:"
+msgid "The sequence key must not be null here!"
 msgstr ""
 
-msgid "Name:"
-msgstr "名称:"
-
-msgid "updated building info"
+msgid "NanoLog"
 msgstr ""
 
-msgid "Tag Element"
+msgid "NanoLog of {0} entries"
 msgstr ""
 
-msgid "Select an item to tag."
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
 msgstr ""
 
-msgid "Tag Building"
-msgstr ""
+msgid "Correlate with GPX..."
+msgstr "与 GPX 关联..."
 
-msgid "Tools: {0}"
+msgid "Put on GPX..."
 msgstr ""
 
-msgid "Area Selection"
+msgid "Correlate entries with GPS trace"
 msgstr ""
 
-msgid "Select an area (e.g. building) from an underlying image."
-msgstr ""
+msgid "Save layer..."
+msgstr "保存图层..."
 
-msgid "Area Selector"
-msgstr ""
+msgid "Save NanoLog layer"
+msgstr "保存 NanoLog 图层"
 
-msgid "Created area"
+msgid "Open NanoLog panel"
 msgstr ""
 
-msgid "Unable to detect a polygon where you clicked."
-msgstr ""
+msgid "Open NanoLog file..."
+msgstr "打开 NanoLog 文件..."
 
-msgid "Error Report"
-msgstr "错误报告"
+msgid "Could not read NanoLog file:"
+msgstr "无法读取 NanoLog 文件:"
 
-msgid "Something went wrong!"
-msgstr "出现问题!"
+msgid "OSM Recommendation"
+msgstr "OSM 建议"
 
-msgid "Please file a bug report on the github project page under"
+msgid "Recommend categories to your newly created instances."
 msgstr ""
 
-msgid ""
-"Let us know what you did and what happend add the following text to the bug "
-"report, so we can find the source of the issue."
+msgid "Training process configuration"
 msgstr ""
 
-msgid "Area Selector - Preferences"
-msgstr ""
+msgid "Model Settings"
+msgstr "模型设置"
 
-msgid "Settings for the area detection algorithm."
+msgid "Select objects or create new objects and get recommendation."
 msgstr ""
 
-msgid "Boofcv - high resolution images"
-msgstr ""
+msgid "Add Recommendation"
+msgstr "添加建议"
 
-msgid "Custom - low resolution images"
-msgstr ""
+msgid "Add a recommended key/value pair to your object"
+msgstr "添加建议的键/值对到您的对象"
 
-msgid ""
-"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
-"Boofcv and uses the custom algorithm as a fallback."
-msgstr ""
+msgid "Train a Model"
+msgstr "训练模型"
 
-msgid "Algorithm"
-msgstr "算法"
+msgid "Start the training engine!"
+msgstr "启动训练机!"
 
-msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
-msgstr ""
+msgid "Edit opening hours"
+msgstr "编辑开放时间"
 
-msgid "Distance Tolerance"
-msgstr "距离容差"
+msgid "Edit time-tag of selected element in a graphical interface"
+msgstr "在图形界面中编辑选定元素的时间标签"
 
-msgid ""
-"Lines with a smaller angle (degrees) than this will be combined to one line "
-"(Default {0})."
-msgstr ""
+msgid "edit existing tag"
+msgstr "编辑现有的标签"
 
-msgid "Angle Tolerance"
-msgstr "角度容差"
+msgid "edit new tag"
+msgstr "编辑新的标签"
 
-msgid ""
-"The color threshold defines how much a color may differ from the selected "
-"color. The red, green and blue values must be in the range of (selected - "
-"threshold) to (selected + threshold). (Default: {0})."
-msgstr ""
+msgid "Display clock in 12h mode."
+msgstr "以 12 小时模式显示时钟。"
 
-msgid "Color Threshold"
-msgstr "颜色阈值"
+msgid "Choose key"
+msgstr "选择属性键"
 
-msgid "Use HSV based algorithm"
-msgstr "使用基于 HSV 算法"
+msgid "apply {0}"
+msgstr "应用 {0}"
 
-msgid ""
-"Use hue and saturation instead of RGB distinction to select matching colors."
-msgstr ""
+msgid "There is something wrong in the value near:"
+msgstr "有错误发生于数值附近:"
 
-msgid "How often thinning operation should be applied (Default {0})."
-msgstr ""
+msgid "Info: {0}"
+msgstr "信息:{0}"
 
-msgid "Thinning Iterations"
-msgstr ""
+msgid "Correct the value manually and than press Enter."
+msgstr "手动修改数值, 然后按回车"
 
-msgid "show address dialog"
-msgstr "显示地址对话框"
+msgid "Error in timeformat"
+msgstr "错误的时间格式"
 
-msgid "Show Address Dialog after mapping an area"
-msgstr "在绘制一个区域后显示地址对话框"
+msgid "open end"
+msgstr "开放结束"
 
-msgid "merge nodes"
-msgstr "合并节点"
+msgid "Import Osm Inspector Bugs..."
+msgstr "导入 OSM 检查器错误..."
 
-msgid "Merge nodes with existing nodes"
-msgstr "将节点合并至既有节点"
+msgid "OsmInspector"
+msgstr "OSM 检查器"
 
-msgid "Debug"
-msgstr "调试"
+msgid "Open OsmInspector"
+msgstr "打开 OSM 检查器"
 
-msgid "Debugging mode will write images for each processing step."
-msgstr ""
+msgid "OsmBugInfo"
+msgstr "OsmBugInfo"
 
-msgid "Building Generalization"
+msgid "Open a OSM Inspector selection list window."
 msgstr ""
 
-msgid ""
-"Beginners draw outlines often very inaccurate. Such buildings shall be "
-"converted to rectangular ones. Angles between 84-96 degrees are converted to "
-"90 degrees."
+msgid "Current Selected Bug Info"
 msgstr ""
 
-msgid "There is no frame loaded !"
-msgstr ""
+msgid "Prev OSMI bug"
+msgstr "前一 OSMI 错误"
 
-msgid "Alert Message"
-msgstr ""
-
-msgid "Street Name:"
-msgstr "街道名称:"
-
-msgid "Big buildings mode"
-msgstr "大型建筑模式"
+msgid "Next OSMI bug"
+msgstr "后一 OSMI 错误"
 
-msgid "Rotate crosshair"
-msgstr "旋转十字令牌"
+msgid "OSM Inspector Bugs"
+msgstr "OSM 检查器错误"
 
-msgid "Advanced settings"
-msgstr "高级设置"
+msgid "Selected Bug Info"
+msgstr "选定错误的信息"
 
-msgid "Buildings tags:"
-msgstr "建筑物标签:"
+msgid "Handy Address Interpolation Functions"
+msgstr "简便的地址编排函数"
 
-msgid "Cannot place building outside of the world."
-msgstr "不能将建筑物放到世界外头。"
+msgid "Define Address Interpolation"
+msgstr "已定义的地址编排规则"
 
-msgid "Create building"
-msgstr "建立建筑物"
+msgid "Odd"
+msgstr "奇数"
 
-msgid "Set buildings size"
-msgstr "设定建筑物大小"
+msgid "Even"
+msgstr "偶数"
 
-msgid "Use Address dialog"
-msgstr "使用地址对话框"
+msgid "Alphabetic"
+msgstr "字母"
 
-msgid "Auto-select building"
-msgstr "自动选择建筑物"
+msgid "Numeric"
+msgstr "数字"
 
-msgid "Use address nodes under buildings"
-msgstr "使用建筑物下节点的地址"
+msgid "Actual"
+msgstr "实际"
 
-msgid "Buildings width:"
-msgstr "建筑物宽度:"
+msgid "Estimate"
+msgstr "估计"
 
-msgid "Length step:"
-msgstr "建筑物长度:"
+msgid "Potential"
+msgstr "潜在"
 
-msgid "Advanced..."
-msgstr "高级..."
+msgid "Relation: {0}"
+msgstr "关系:{0}"
 
-msgid "Draw buildings"
-msgstr "绘制建筑物"
+msgid "Associate with street using:"
+msgstr "与街道关联的方式:"
 
-msgid "Point on the corner of the building to start drawing"
-msgstr "点击建筑物的一角以开始绘制"
+msgid "Numbering Scheme:"
+msgstr "编号规则:"
 
-msgid "Point on opposite end of the building"
-msgstr "点击建筑物的另一端"
+msgid "Increment:"
+msgstr "递增:"
 
-msgid "Set width of the building"
-msgstr "设置建筑物的宽度"
+msgid "Starting #:"
+msgstr "开始 #:"
 
-msgid "Merge address points"
-msgstr "合并地址点"
+msgid "Ending #:"
+msgstr "结尾 #:"
 
-msgid "Move tags from address nodes inside buildings to building ways"
-msgstr ""
+msgid "Accuracy:"
+msgstr "准确度:"
 
-msgid "Select both address nodes and building ways to merge"
-msgstr ""
+msgid "Convert way to individual house numbers."
+msgstr "将路径转换为个别的房屋号码。"
 
-msgid "No address nodes found in the selection"
-msgstr ""
+msgid "Will associate {0} additional house number nodes"
+msgstr "将关联 {0} 个额外的房屋号码节点"
 
-msgid "No building ways found in the selection"
-msgstr ""
+msgid "City:"
+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] ""
+msgid "State:"
+msgstr "状态:"
 
-msgid "There is {0} building with address conflicts"
-msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Post Code:"
+msgstr "邮政编码:"
 
-msgid "No address nodes inside buildings found"
-msgstr ""
+msgid "Country:"
+msgstr "国家:"
 
-msgid "on polygon"
-msgstr "在多边形上"
+msgid "Full Address:"
+msgstr "完整地址:"
 
-msgid "Add address"
-msgstr "添加地址"
+msgid "Optional Information:"
+msgstr "选择性的信息:"
 
-msgid "Helping tool for tag address"
-msgstr "帮助标记地址的工具"
+msgid "Please select a street to associate with address interpolation way"
+msgstr "请选择一个街道和地址插值方法关联"
 
-msgid "CadastreFR - Buildings"
-msgstr ""
+msgid "Please select address interpolation way for this street"
+msgstr "请为这条街道选择地址插值方法"
 
-msgid "Next no"
-msgstr "下一编号"
+msgid "Expected odd numbers for addresses"
+msgstr "预测的奇数地址"
 
-msgid "Enter addresses"
-msgstr "输入地址"
+msgid "Expected even numbers for addresses"
+msgstr "预测的偶数地址"
 
-msgid ""
-"Location \"{0}\" found in cache.\n"
-"Load cache first ?\n"
-"(No = new cache)"
+msgid "Expected valid number for increment"
 msgstr ""
-"在缓存中发现位置“{0}”。\n"
-"是否先加载缓存?\n"
-"(否 = 新增缓存)"
 
-msgid "Select Feuille"
-msgstr ""
+msgid "Country code must be 2 letters"
+msgstr "国码只能使用 2 个字节"
 
-msgid ""
-"Error loading file.\n"
-"Probably an old version of the cache file."
-msgstr ""
-"加载文件时发生错误。\n"
-"可能是旧版的缓存文件。"
+msgid "Please enter valid number for starting and ending address"
+msgstr "请输入开始与结尾地址的有效编号"
 
-msgid "Lambert Zone {0} cache file (.{0})"
-msgstr "兰勃特区 {0} 缓存文件(.{0})"
+msgid "Alphabetic address must end with a letter"
+msgstr "字母住址必须以字母结尾"
 
-msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
-msgstr "兰勃特 CC9 区 {0} 缓存文件(.CC{0})"
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgstr "开始与结尾的编号必须属于同一个字母地址"
 
-msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
-msgstr "Guadeloupe Fort-Marigot 缓存文件(.UTM1)"
+msgid "Starting address letter must be less than ending address letter"
+msgstr "开始住址的字母必须少于结尾住址的字母"
 
-msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
-msgstr "Guadeloupe Ste-Anne 缓存文件(.UTM2)"
+msgid "Please enter valid number for starting address"
+msgstr "请输入开始住址的有效数字"
 
-msgid "Martinique Fort Desaix cache file (.UTM3)"
-msgstr "Martinique Fort Desaix 缓存文件(.UTM3)"
+msgid "Please enter valid number for ending address"
+msgstr "请输入结尾住址的有效数字"
 
-msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Reunion RGR92 缓存文件(.UTM4)"
+msgid "Starting address number must be less than ending address number"
+msgstr "开始住址的数字必须少于结尾住址的数字"
 
-msgid "CadastreGrabber: Illegal url."
-msgstr "CadastreGrabber:不合法的 url。"
+msgid "Align Way Segments"
+msgstr "对齐路径区段"
+
+msgid "Align Ways"
+msgstr "对齐路径"
 
 msgid ""
-"Cannot open a new client session.\n"
-"Server in maintenance or temporary overloaded."
+"Please select two segments that don''t share any nodes.\n"
+"Alternatively put the pivot on their common node.\n"
 msgstr ""
-"不能打开新的客户端 session。\n"
-"服务器正在维护或是暂时过载。"
 
 msgid ""
-"Town/city {0} not found or not available\n"
-"or action canceled"
+"Aligning would result nodes ''outside the world''.\n"
+"Alignment not possible.\n"
 msgstr ""
-"城/镇 {0} 找不到或无法使用\n"
-"或是动作已取消"
-
-msgid "Choose from..."
-msgstr "选择自..."
-
-msgid "Select commune"
-msgstr "选择社区"
-
-msgid "Auto sourcing"
-msgstr "自动来源"
 
 msgid ""
-"Please enable at least two WMS layers in the cadastre-fr plugin "
-"configuration.\n"
-"Layers ''Building'' and ''Parcel'' added by default."
+"There is at least a non-pivot endpoint of the alignee that joins more than "
+"two way segments.\n"
+"Preserved angles type alignment is not possible.\n"
 msgstr ""
 
 msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
-msgstr "警告:无法将选项窗格置于最上层。异常为:{0}"
+"The alignment is not possible with maintaining the angles of the joint "
+"segments.\n"
+"Either choose the ''keep length'' aligning method or select other segments.\n"
+msgstr ""
 
 msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
 msgstr ""
-"要启用 cadastre WMS 插件,\n"
-"请改变目前的投影法为 cadastre 投影法\n"
-"后再试一次"
 
-msgid "Change the current projection"
+msgid "Undocumented problem occured.\n"
 msgstr ""
 
-msgid "Replace original background by JOSM background color."
-msgstr "以 JOSM 背景颜色取代原始背景。"
+msgid "AlignWayS: Alignment not possible"
+msgstr "AlignWayS:无法进行对齐"
 
-msgid "Reverse grey colors (for black backgrounds)."
-msgstr "反转灰色(用于黑色背景)。"
+msgid "Align way segment"
+msgstr "对齐路径区段"
 
-msgid "Set background transparent."
-msgstr "设定背景透明度。"
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+"请选择两个没有共用任何节点的区段,\n"
+"或在它们的共通节点上放置中心轴。\n"
 
-msgid "Draw boundaries of downloaded data."
-msgstr "绘出已下载数据的边界。"
+msgid "Align Way Segments: Modes"
+msgstr "对齐路径区段:模式"
 
-msgid "Disable image cropping during georeferencing."
-msgstr "在进行地理参照时,停用图片剪裁。"
+msgid "Align Ways control panel"
+msgstr "对齐路径控制面板"
 
-msgid "Use \"Tableau d''assemblage\""
-msgstr ""
+msgid "This panel activates in Align Ways mode:"
+msgstr "此面板在对齐路径模式中激活:"
 
-msgid "Replace grey shades by white color only"
-msgstr ""
+msgid "Length preserved"
+msgstr "保留长度"
 
-msgid "Select first WMS layer in list."
-msgstr "先在列表中选定一个 WMS 图层。"
+msgid "Angle preserved"
+msgstr "保留角度"
 
-msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
-msgstr "不要为地址使用关系(但为元素使用“addr:street”)"
+msgid "Align with:"
+msgstr "对齐:"
 
-msgid "off"
-msgstr "关"
+msgid ""
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
+msgstr ""
 
-msgid "25 m"
-msgstr "25 m"
+msgid ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
+msgstr ""
 
-msgid "50 m"
-msgstr "50 m"
+msgid "I''m ready!"
+msgstr "准备就绪!"
 
-msgid "100 m"
-msgstr "100 m"
+msgid "AlignWays Tips"
+msgstr "AlignWays 技巧"
 
-msgid "high"
-msgstr "高"
+msgid "AlignWays: What''s New..."
+msgstr "AlignWays:新功能..."
 
-msgid "medium"
-msgstr "中"
+msgid "Align Ways mode"
+msgstr "对齐路径模式"
 
-msgid "low"
-msgstr "低"
+msgid "Parameter ''{0}'' must not be null"
+msgstr "参数“{0}”不能为空"
 
-msgid "symbol"
-msgstr "符号"
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"要对齐的区段不能和参考用区段是同一个。\n"
+"请选择不同的区段来对齐。"
 
-msgid "parcel"
-msgstr "包裹"
+msgid "AlignWayS message"
+msgstr "AlignWayS 信息"
 
-msgid "parcel number"
-msgstr "地号"
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
+msgstr ""
+"参考用区段不能和要对齐的区段是同一个。\n"
+"请选择不同的参考区段。"
 
-msgid "address"
-msgstr "住址"
+msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
+msgstr ""
 
-msgid "locality"
-msgstr "所在地"
+msgid ": Align segments; Alt-click: Clear selection"
+msgstr ""
 
-msgid "section"
-msgstr "节"
+msgid ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
+msgstr ""
 
-msgid "commune"
-msgstr "合作社"
+msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
+msgstr ""
 
-msgid "Enable automatic caching."
-msgstr "启用自动缓存。"
+msgid ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
+msgstr ""
 
-msgid "Max. cache size (in MB)"
-msgstr "最大缓存容量(MB)"
+msgid ""
+"Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgstr ""
+"欢迎使用</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> 插件<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...或者应该被称为<br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> 插件..."
 
-msgid "French cadastre WMS"
-msgstr "法国 cadastre WMS"
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<p style=\"font-family:sans-serif; font-weight:bold;\">AlignWays 会帮助您对齐两个\n"
+"路径区段。举例来说,当您在描绘建筑物的\n"
+"轮廓而且希望它的边缘和街道或道路平行\n"
+"时会很有帮助。<br>\n"
+"<br>\n"
+"在您开始前有些技巧可能有所帮助:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
-"在 www.cadastre.gouv.fr 的法国土地用途 wms<BR><BR>请先在这里阅读使用的条件与条款:<br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>之后才上传以本插件所创建的数据。"
+"<html>\n"
+"<div style=\"font-family:sans-serif;\">\n"
+"<ul>\n"
+"<li><b>选择一个参考区段。</b> 要这么做您可以按<b><i><span style=\"color:green\">Ctrl-"
+"点击</span></i></b>\n"
+"一个区段。而另一个,要被对齐的区段就会变得跟这个区段\n"
+"平行。</li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr "<html>当自动来源启用时设定键“source”的数值</html>"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>选择要对齐的区段。</b>您可以通过简单地<b><i><span "
+"style=\"color:green\">点击</span></i></b>这个不同的区段。\n"
+"默认情况下,旋转支点将突出在该区段的中心。\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 msgid ""
-"Replace the original white background by the background color defined in "
-"JOSM preferences."
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>可选<b>改变旋转支点。</b>为了与参考区段平行,要对齐的区段将绕这一点旋转。您可以通过在附近<b><i><span "
+"style=\"color:green\">点击</span></i></b>,以选择区段的两个端点或中心。\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
-msgstr "反转原始的黑色与白色(和所有中间的灰色)。当文字在暗色背景中时很有用。"
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>对齐区段。</b>按<b><i><span "
+"style=\"color:green\">{0}</span></i></b>。另外您可以在<b>工具</b>\n"
+"目录中找到命令行,或是希望将此动作放在<b>工具栏</b>上\n"
+"。\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
-msgid "Allows multiple layers stacking"
-msgstr "允许多重图层堆叠"
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>最后提示:</b> 如果您想要重新开始选择,有一个很简单的方法:<b><i><span style=\"color:green\">Alt-"
+"点击</span></i></b>地图的某个地方。\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
-msgstr "设定 WMS 图层透明度。右边是不透明,左边是透明。"
+msgid "Don''t show this again"
+msgstr "不要再次显示这个信息"
 
-msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr "在从 WMS 服务器下载的数据周围绘出一个矩形。"
+msgid "What''s new..."
+msgstr "新功能..."
 
-msgid "Image resolution:"
-msgstr "图片分辨率:"
+msgid "Added <b>angle preserving</b> aligning mode"
+msgstr ""
 
-msgid "High resolution (1000x800)"
-msgstr "高分辨率(1000x800)"
+msgid "Various improvements and bugfixes"
+msgstr "各种改进和错误修正"
 
-msgid "Medium resolution (800x600)"
-msgstr "中分辨率(800x600)"
+msgid "Errr..."
+msgstr "囧..."
 
-msgid "Low resolution (600x400)"
-msgstr "低分辨率(600x400)"
+msgid "Browser not supported."
+msgstr "浏览器不支持。"
 
-msgid "Image filter interpolation:"
-msgstr "图片过滤器插补:"
+msgid "Building address"
+msgstr "建筑地址"
 
-msgid "Nearest-Neighbor (fastest) [ Default ]"
-msgstr "最邻近(最快)[默认值]"
+msgid "empty"
+msgstr "空"
 
-msgid "Bilinear (fast)"
-msgstr "双线性(快速)"
+msgid "skip"
+msgstr "跳过"
 
-msgid "Bicubic (slow)"
-msgstr "双立体(慢速)"
+msgid "House number:"
+msgstr "门牌号码:"
 
-msgid "Vector images grab multiplier:"
-msgstr "矢量图片抓取倍数:"
+msgid "Street:"
+msgstr "街道:"
 
-msgid "Grab one image full screen"
-msgstr "抓取一张全屏图片"
+msgid "Post code:"
+msgstr "邮编:"
 
-msgid "Grab smaller images (higher quality but use more memory)"
-msgstr "抓取较小的图片(较高的品质但消耗更多内存)"
+msgid "Building:"
+msgstr ""
 
-msgid "Fixed size square (default is 100m)"
-msgstr "固定大小矩形(默认为 100m)"
+msgid "Tags:"
+msgstr ""
 
-msgid "Fixed size (from 25 to 1000 meters)"
-msgstr "固定大小(从 25 到 100 米)"
+msgid "Name:"
+msgstr "名称:"
 
-msgid "Layers:"
-msgstr "图层:"
+msgid "updated building info"
+msgstr ""
 
-msgid "Sea, rivers, swimming pools."
-msgstr "海洋、河流、游泳池。"
+msgid "Tag Element"
+msgstr ""
 
-msgid "Buildings, covers, underground constructions."
-msgstr "建筑、遮蔽物、地下建筑物。"
+msgid "Select an item to tag."
+msgstr ""
 
-msgid "Symbols like cristian cross."
-msgstr "符号,像十字架之类。"
+msgid "Tag Building"
+msgstr ""
 
-msgid "Parcels."
-msgstr "包裹。"
+msgid "Tools: {0}"
+msgstr ""
 
-msgid "Parcels numbers, street names."
-msgstr "包裹号码,街道名称。"
+msgid "Area Selection"
+msgstr ""
 
-msgid "Address, houses numbers."
-msgstr "地址、门牌号码"
+msgid "Select an area (e.g. building) from an underlying image."
+msgstr ""
 
-msgid "Locality, hamlet, place."
-msgstr "所在地、村庄、位置。"
+msgid "Area Selector"
+msgstr ""
 
-msgid "Cadastral sections and subsections."
+msgid "Created area"
 msgstr ""
 
-msgid "Municipality administrative borders."
-msgstr "自治行政区边界。"
+msgid "Unable to detect a polygon where you clicked."
+msgstr ""
 
-msgid "Raster images grab multiplier:"
-msgstr "点阵图片抓取倍数:"
+msgid "Error Report"
+msgstr "错误报告"
+
+msgid "Something went wrong!"
+msgstr "出现问题!"
+
+msgid "Please file a bug report on the github project page under"
+msgstr ""
 
 msgid ""
-"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
+"Let us know what you did and what happend add the following text to the bug "
+"report, so we can find the source of the issue."
 msgstr ""
 
-msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgid "Area Selector - Preferences"
 msgstr ""
 
-msgid "Display crosspieces:"
+msgid "Settings for the area detection algorithm."
 msgstr ""
 
-msgid "Allows an automatic caching"
+msgid "Boofcv - high resolution images"
 msgstr ""
 
-msgid "Oldest files are automatically deleted when this size is exceeded"
-msgstr "当超过这个大小时,较旧的文件会自动删除"
+msgid "Custom - low resolution images"
+msgstr ""
 
 msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
-msgstr "如果抓取时有多个图层,则自动选择第一个 WMS 图层。"
+"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
+msgstr ""
+
+msgid "Algorithm"
+msgstr "算法"
+
+msgid ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
+msgstr ""
 
-msgid "Enable this to use the tag \"add:street\" on nodes."
-msgstr "启用这个选项,以使用节点的“add:street”标签。"
+msgid "Distance Tolerance"
+msgstr "距离容差"
 
-msgid "Unexpected file extension. {0}"
+msgid ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
 msgstr ""
 
-msgid "Add \"source=...\" to elements?"
-msgstr "将“source=...”添加到元件?"
+msgid "Angle Tolerance"
+msgstr "角度容差"
 
-msgid "Downloading {0}"
-msgstr "正在下载 {0}"
+msgid ""
+"The color threshold defines how much a color may differ from the selected "
+"color. The red, green and blue values must be in the range of (selected - "
+"threshold) to (selected + threshold). (Default: {0})."
+msgstr ""
 
-msgid "Contacting WMS Server..."
-msgstr "正在连接 WMS 服务器..."
+msgid "Color Threshold"
+msgstr "颜色阈值"
 
-msgid "Create buildings"
-msgstr "建立建筑"
+msgid "Use HSV based algorithm"
+msgstr "使用基于 HSV 算法"
 
 msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
+"Use hue and saturation instead of RGB distinction to select matching colors."
 msgstr ""
-"要避免 cadastre WMS 超载,\n"
-"建筑输入的大小限制在最大 1 km2。"
 
-msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgid "How often thinning operation should be applied (Default {0})."
 msgstr ""
 
-msgid "Extract SVG ViewBox..."
-msgstr "提取 SVG ViewBox..."
+msgid "Thinning Iterations"
+msgstr ""
 
-msgid "Extract best fitting boundary..."
-msgstr "提取最合适的边界..."
+msgid "show address dialog"
+msgstr "显示地址对话框"
 
-msgid "Create boundary"
-msgstr "建立边界"
+msgid "Show Address Dialog after mapping an area"
+msgstr "在绘制一个区域后显示地址对话框"
 
-msgid "Contacting cadastre WMS ..."
-msgstr "正在连接 cadastre WMS ..."
+msgid "merge nodes"
+msgstr "合并节点"
 
-msgid "Image already loaded"
-msgstr "图片已加载"
+msgid "Merge nodes with existing nodes"
+msgstr "将节点合并至既有节点"
 
-msgid ""
-"Municipality vectorized !\n"
-"Use the normal Cadastre Grab menu."
-msgstr ""
+msgid "Debug"
+msgstr "调试"
 
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
+msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
-msgid "Extract commune boundary"
-msgstr "提取公共边界"
-
-msgid "Only on vectorized layers"
-msgstr "只在矢量图层"
+msgid "Building Generalization"
+msgstr ""
 
-msgid "Cancel current grab"
+msgid ""
+"Beginners draw outlines often very inaccurate. Such buildings shall be "
+"converted to rectangular ones. Angles between 84-96 degrees are converted to "
+"90 degrees."
 msgstr ""
 
-msgid "Cancel current grab (only vector images)"
+msgid "There is no frame loaded !"
 msgstr ""
 
-msgid "Cadastre grab"
+msgid "Alert Message"
 msgstr ""
 
-msgid "Download Image from French Cadastre WMS"
-msgstr "从法国 Cadastre WMS 下载图片"
+msgid "Street Name:"
+msgstr "街道名称:"
 
-msgid "Cadastre: {0}"
-msgstr "Cadastre:{0}"
+msgid "Big buildings mode"
+msgstr "大型建筑模式"
 
-msgid "Georeference an image"
-msgstr ""
+msgid "Rotate crosshair"
+msgstr "旋转十字令牌"
 
-msgid "Grab non-georeferenced image"
-msgstr "抓取非地理参照的图片"
+msgid "Advanced settings"
+msgstr "高级设置"
 
-msgid "Georeferencing interrupted"
-msgstr "地理参照被中断"
+msgid "Buildings tags:"
+msgstr "建筑物标签:"
 
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
-msgstr ""
-"这张图片包含地理参照数据。\n"
-"您是否想要使用它们?"
+msgid "Cannot place building outside of the world."
+msgstr "不能将建筑物放到世界外头。"
 
-msgid "Load layer from cache"
-msgstr "从缓存中加载图层"
+msgid "Create building"
+msgstr "建立建筑物"
 
-msgid "Load location from cache (only if cache is enabled)"
-msgstr "从缓存加载位置(只有在缓存已启用时)"
+msgid "Set buildings size"
+msgstr "设定建筑物大小"
 
-msgid "{0} not allowed with the current projection"
-msgstr "{0} 不允许使用目前的投影法"
+msgid "Use Address dialog"
+msgstr "使用地址对话框"
 
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
-msgstr "不能加载缓存 {0},因为与目前的投影法区域不相容"
+msgid "Auto-select building"
+msgstr "自动选择建筑物"
 
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
-msgstr "选定的文件 {0} 不是这个插件的缓存文件(无效的字节)"
+msgid "Use address nodes under buildings"
+msgstr "使用建筑物下节点的地址"
 
-msgid "The location {0} is already on screen. Cache not loaded."
-msgstr "位置 {0} 已经在画面上。缓存未加载。"
+msgid "Buildings width:"
+msgstr "建筑物宽度:"
 
-msgid "(optional)"
-msgstr "(选择性的)"
+msgid "Length step:"
+msgstr "建筑物长度:"
 
-msgid "Change location"
-msgstr "改变位置"
+msgid "Advanced..."
+msgstr "高级..."
 
-msgid "Set a new location for the next request"
-msgstr "为下个要求设定新的位置"
+msgid "Draw buildings"
+msgstr "绘制建筑物"
 
-msgid "Add a new municipality layer"
-msgstr "添加新的自治区图层"
+msgid "Point on the corner of the building to start drawing"
+msgstr "点击建筑物的一角以开始绘制"
 
-msgid "Commune"
-msgstr ""
+msgid "Point on opposite end of the building"
+msgstr "点击建筑物的另一端"
 
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
-msgstr "<html>输入镇、乡或城市名称。<br>使用在 www.cadastre.gouv.fr 已知的语法及标点。</html>"
+msgid "Set width of the building"
+msgstr "设置建筑物的宽度"
 
-msgid "Departement"
-msgstr ""
+msgid "Merge address points"
+msgstr "合并地址点"
 
-msgid "<html>Departement number (optional)</html>"
+msgid "Move tags from address nodes inside buildings to building ways"
 msgstr ""
 
-msgid "Add new layer"
-msgstr "添加新的图层"
-
-msgid "Open Cadastre Preferences"
+msgid "Select both address nodes and building ways to merge"
 msgstr ""
 
-msgid "Refine georeferencing"
+msgid "No address nodes found in the selection"
 msgstr ""
 
-msgid "Improve georeferencing (only raster images)"
+msgid "No building ways found in the selection"
 msgstr ""
 
-msgid "Reset cookie"
-msgstr "重设 cookie"
+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] ""
 
-msgid "Get a new cookie (session timeout)"
-msgstr "取得新的 cookie(会话超时)"
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Save image as..."
-msgstr "图像另存为..."
+msgid "No address nodes inside buildings found"
+msgstr ""
 
-msgid "PNG files (*.png)"
-msgstr "PNG 文件(*.png)"
+msgid "on polygon"
+msgstr "在多边形上"
 
-msgid "GeoTiff files (*.tif)"
-msgstr "GeoTiff 文件(*.tif)"
+msgid "Add address"
+msgstr "添加地址"
 
-msgid "Export image (only raster images)"
-msgstr ""
+msgid "Helping tool for tag address"
+msgstr "帮助标记地址的工具"
 
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "CadastreFR - Buildings"
 msgstr ""
-"点击剪裁图片的第一个角落\n"
-"(需要两个点)"
 
-msgid "Image cropping"
-msgstr "图片剪裁"
+msgid "Next no"
+msgstr "下一编号"
+
+msgid "Enter addresses"
+msgstr "输入地址"
 
 msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
 msgstr ""
+"在缓存中发现位置“{0}”。\n"
+"是否先加载缓存?\n"
+"(否 = 新增缓存)"
 
-msgid "Image georeferencing"
-msgstr "图片地理参照"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "Select Feuille"
 msgstr ""
-"您是否想要完全取消或是\n"
-"要再试一次 "
 
 msgid ""
-"Ooops. I failed to catch all coordinates\n"
-"correctly. Retry please."
+"Error loading file.\n"
+"Probably an old version of the cache file."
 msgstr ""
+"加载文件时发生错误。\n"
+"可能是旧版的缓存文件。"
 
-msgid "Enter cadastre east,north position"
-msgstr "输入 cadastre 东,北 方位置"
+msgid "Lambert Zone {0} cache file (.{0})"
+msgstr "兰勃特区 {0} 缓存文件(.{0})"
 
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(警告:检验有箭头的北方!!)"
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgstr "兰勃特 CC9 区 {0} 缓存文件(.CC{0})"
 
-msgid "East"
-msgstr "东"
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgstr "Guadeloupe Fort-Marigot 缓存文件(.UTM1)"
+
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgstr "Guadeloupe Ste-Anne 缓存文件(.UTM2)"
 
-msgid "I use the mouse"
-msgstr "我使用鼠标"
+msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgstr "Martinique Fort Desaix 缓存文件(.UTM3)"
 
-msgid "Set {0} Lambert coordinates"
-msgstr "设定 {0} 兰勃特坐标"
+msgid "Reunion RGR92 cache file (.UTM4)"
+msgstr "Reunion RGR92 缓存文件(.UTM4)"
 
-msgid "Click second corner for image cropping"
-msgstr "点击剪裁图片的第二个角落"
+msgid "CadastreGrabber: Illegal url."
+msgstr "CadastreGrabber:不合法的 url。"
 
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
 msgstr ""
+"不能打开新的客户端 session。\n"
+"服务器正在维护或是暂时过载。"
 
-msgid "Adjust WMS"
-msgstr "调整 WMS"
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
+msgstr ""
+"城/镇 {0} 找不到或无法使用\n"
+"或是动作已取消"
 
-msgid "Adjust the position of the WMS layer (saved for raster images only)"
-msgstr "调整 WMS 图层的位置(只能为点阵图像保存)"
+msgid "Choose from..."
+msgstr "选择自..."
+
+msgid "Select commune"
+msgstr "选择社区"
+
+msgid "Auto sourcing"
+msgstr "自动来源"
 
 msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
-"发现一个以上的 WMS 图层\n"
-"请先选择它们中的一个,然后重试"
 
-msgid "Reset offset"
-msgstr "重置偏移"
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgstr "警告:无法将选项窗格置于最上层。异常为:{0}"
 
-msgid "Reset offset (only vector images)"
-msgstr "重置偏移(仅矢量图像)"
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
+msgstr ""
+"要启用 cadastre WMS 插件,\n"
+"请改变目前的投影法为 cadastre 投影法\n"
+"后再试一次"
 
-msgid "Blank Layer"
-msgstr "空白图层"
+msgid "Change the current projection"
+msgstr ""
 
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr "WMS 图层({0}),已加载 {1} 个瓦片"
+msgid "Replace original background by JOSM background color."
+msgstr "以 JOSM 背景颜色取代原始背景。"
 
-msgid "Is not vectorized."
-msgstr "并非矢量化的。"
+msgid "Reverse grey colors (for black backgrounds)."
+msgstr "反转灰色(用于黑色背景)。"
 
-msgid "Bounding box: {0}"
-msgstr "限定边框:{0}"
+msgid "Set background transparent."
+msgstr "设定背景透明度。"
 
-msgid "Image size (px): {0}/{1}"
-msgstr ""
+msgid "Draw boundaries of downloaded data."
+msgstr "绘出已下载数据的边界。"
 
-msgid "Is vectorized."
-msgstr "是矢量化的。"
+msgid "Disable image cropping during georeferencing."
+msgstr "在进行地理参照时,停用图片剪裁。"
 
-msgid "Commune bbox: {0}"
+msgid "Use \"Tableau d''assemblage\""
 msgstr ""
 
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
+msgid "Replace grey shades by white color only"
 msgstr ""
-"不支持的缓存文件版本;发现 {0},应为 {1}\n"
-"建立一个新的。"
 
-msgid "Cache Format Error"
-msgstr "缓存格式错误"
+msgid "Select first WMS layer in list."
+msgstr "先在列表中选定一个 WMS 图层。"
 
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr "缓存中的兰勃特区 {0} 与目前的兰勃特区 {1} 不相容"
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
+msgstr "不要为地址使用关系(但为元素使用“addr:street”)"
 
-msgid "Cache Lambert Zone Error"
-msgstr "缓存兰勃特区发生错误"
+msgid "off"
+msgstr "关"
 
-msgid "canvec tile helper"
-msgstr "canvec 瓦片帮助"
+msgid "25 m"
+msgstr "25 m"
 
-msgid "Use"
-msgstr "使用"
+msgid "50 m"
+msgstr "50 m"
 
-msgid "Please select a scheme to use."
-msgstr "请选择要使用的配置。"
+msgid "100 m"
+msgstr "100 m"
 
-msgid "Color Scheme"
-msgstr "色彩配置"
+msgid "high"
+msgstr "高"
 
-msgid "Please select the scheme to delete."
-msgstr "请选择要删除的配置。"
+msgid "medium"
+msgstr "中"
 
-msgid "Use the selected scheme from the list."
-msgstr "使用从列表选定的配置。"
+msgid "low"
+msgstr "低"
 
-msgid "Use the current colors as a new color scheme."
-msgstr "使用目前的颜色作为新的颜色配置。"
+msgid "symbol"
+msgstr "符号"
 
-msgid "Delete the selected scheme from the list."
-msgstr "从列表中删除选定的配置。"
+msgid "parcel"
+msgstr "包裹"
 
-msgid "Color Schemes"
-msgstr "颜色配置"
+msgid "parcel number"
+msgstr "地号"
 
-msgid "Conflate object pair"
-msgstr ""
+msgid "address"
+msgstr "住址"
 
-msgid "Added {0} object to subject layer"
-msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgid "locality"
+msgstr "所在地"
 
-msgid "Conflation"
-msgstr ""
+msgid "section"
+msgstr "节"
 
-msgid "Activates the conflation plugin"
-msgstr ""
+msgid "commune"
+msgstr "合作社"
 
-msgid "Matches"
-msgstr ""
+msgid "Enable automatic caching."
+msgstr "启用自动缓存。"
 
-msgid "Reference only"
-msgstr ""
+msgid "Max. cache size (in MB)"
+msgstr "最大缓存容量(MB)"
 
-msgid "Subject only"
-msgstr ""
+msgid "French cadastre WMS"
+msgstr "法国 cadastre WMS"
 
-msgid "Matches ({0})"
+msgid ""
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
+"在 www.cadastre.gouv.fr 的法国土地用途 wms<BR><BR>请先在这里阅读使用的条件与条款:<br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>之后才上传以本插件所创建的数据。"
 
-msgid "Reference only ({0})"
-msgstr ""
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgstr "<html>当自动来源启用时设定键“source”的数值</html>"
 
-msgid "Subject only ({0})"
+msgid ""
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
-msgid "Configure"
-msgstr "设置"
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
+msgstr "反转原始的黑色与白色(和所有中间的灰色)。当文字在暗色背景中时很有用。"
 
-msgid "Configure conflation options"
-msgstr ""
+msgid "Allows multiple layers stacking"
+msgstr "允许多重图层堆叠"
 
-msgid "Delete {0} conflation matches"
-msgstr ""
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgstr "设定 WMS 图层透明度。右边是不透明,左边是透明。"
 
-msgid "Remove {0} unmatched objects"
-msgstr ""
+msgid "Draw a rectangle around downloaded data from WMS server."
+msgstr "在从 WMS 服务器下载的数据周围绘出一个矩形。"
 
-msgid "Remove selected matches"
-msgstr ""
+msgid "Image resolution:"
+msgstr "图片分辨率:"
 
-msgid "Conflate"
-msgstr ""
+msgid "High resolution (1000x800)"
+msgstr "高分辨率(1000x800)"
 
-msgid "Conflate selected objects"
-msgstr ""
+msgid "Medium resolution (800x600)"
+msgstr "中分辨率(800x600)"
 
-msgid "Conflation: {0}"
-msgstr ""
+msgid "Low resolution (600x400)"
+msgstr "低分辨率(600x400)"
 
-msgid "Cannot replace geometry."
-msgstr ""
+msgid "Image filter interpolation:"
+msgstr "图片过滤器插补:"
 
-msgid "Zoom to selected primitive(s)"
-msgstr ""
+msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgstr "最邻近(最快)[默认值]"
 
-msgid "Select selected primitive(s)"
-msgstr ""
+msgid "Bilinear (fast)"
+msgstr "双线性(快速)"
 
-msgid "Select the primitives currently selected in the list"
-msgstr ""
+msgid "Bicubic (slow)"
+msgstr "双立体(慢速)"
 
-msgid "Match finder settings"
-msgstr ""
+msgid "Vector images grab multiplier:"
+msgstr "矢量图片抓取倍数:"
 
-msgid "Match finder method"
-msgstr ""
+msgid "Grab one image full screen"
+msgstr "抓取一张全屏图片"
 
-msgid "Threshold distance"
-msgstr ""
+msgid "Grab smaller images (higher quality but use more memory)"
+msgstr "抓取较小的图片(较高的品质但消耗更多内存)"
 
-msgid "Distances greater than this will result in a score of zero."
-msgstr ""
+msgid "Fixed size square (default is 100m)"
+msgstr "固定大小矩形(默认为 100m)"
 
-msgid "Centroid distance"
-msgstr ""
+msgid "Fixed size (from 25 to 1000 meters)"
+msgstr "固定大小(从 25 到 100 米)"
 
-msgid "Hausdorff distance"
-msgstr ""
+msgid "Layers:"
+msgstr "图层:"
 
-msgid "Configure conflation settings"
-msgstr ""
+msgid "Sea, rivers, swimming pools."
+msgstr "海洋、河流、游泳池。"
 
-msgid "Generate matches"
-msgstr ""
+msgid "Buildings, covers, underground constructions."
+msgstr "建筑、遮蔽物、地下建筑物。"
 
-msgid "Layer:"
-msgstr "图层:"
+msgid "Symbols like cristian cross."
+msgstr "符号,像十字架之类。"
 
-msgid "{0}: 0 / {1}: 0 / {2}: 0"
-msgstr "{0}: 0 / {1}: 0 / {2}: 0"
+msgid "Parcels."
+msgstr "包裹。"
 
-msgid "Subject"
-msgstr ""
+msgid "Parcels numbers, street names."
+msgstr "包裹号码,街道名称。"
 
-msgid "Selections must be made for both reference and subject."
-msgstr ""
+msgid "Address, houses numbers."
+msgstr "地址、门牌号码"
 
-msgid "Incomplete selections"
-msgstr ""
+msgid "Locality, hamlet, place."
+msgstr "所在地、村庄、位置。"
 
-msgid "Restore subject selection"
+msgid "Cadastral sections and subsections."
 msgstr ""
 
-msgid "Restore reference selection"
-msgstr ""
+msgid "Municipality administrative borders."
+msgstr "自治行政区边界。"
 
-msgid "Freeze subject selection"
-msgstr ""
+msgid "Raster images grab multiplier:"
+msgstr "点阵图片抓取倍数:"
 
-msgid "No valid OSM data layer present."
+msgid ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
-msgid "Error freezing selection"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
 msgstr ""
 
-msgid "Nothing is selected, please try again."
+msgid "Display crosspieces:"
 msgstr ""
 
-msgid "Empty selection"
-msgstr "空选择范围"
-
-msgid "Freeze reference selection"
+msgid "Allows an automatic caching"
 msgstr ""
 
-msgid "{0}: {1} / {2}: {3} / {4}: {5}"
-msgstr "{0}: {1} / {2}: {3} / {4}: {5}"
-
-msgid "Invalid reference or subject"
-msgstr ""
+msgid "Oldest files are automatically deleted when this size is exceeded"
+msgstr "当超过这个大小时,较旧的文件会自动删除"
 
-msgid "Download OSM data continuously"
-msgstr "连续下载 OSM 数据"
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
+msgstr "如果抓取时有多个图层,则自动选择第一个 WMS 图层。"
 
-msgid "Download map data continuously when paning and zooming."
-msgstr "平移和缩放时连续下载地图数据。"
+msgid "Enable this to use the tag \"add:street\" on nodes."
+msgstr "启用这个选项,以使用节点的“add:street”标签。"
 
-msgid "Toggle the continuous download on/off"
-msgstr "切换连续下载"
+msgid "Unexpected file extension. {0}"
+msgstr ""
 
-msgid "Activate continuous downloads at startup."
-msgstr "启动时激活连续下载。"
+msgid "Add \"source=...\" to elements?"
+msgstr "将“source=...”添加到元件?"
 
-msgid "Supress the default modal progress monitor when downloading."
-msgstr ""
+msgid "Downloading {0}"
+msgstr "正在下载 {0}"
 
-msgid "Download Settings"
-msgstr "下载设置"
+msgid "Contacting WMS Server..."
+msgstr "正在连接 WMS 服务器..."
 
-msgid "Settings for the continuous download."
-msgstr "连续下载设置。"
+msgid "Create buildings"
+msgstr "建立建筑"
 
 msgid ""
-"If this plugin is active at startup. This default state will not change when "
-"you are toggeling the plugin with the menu option."
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
 msgstr ""
+"要避免 cadastre WMS 超载,\n"
+"建筑输入的大小限制在最大 1 km2。"
 
-msgid ""
-"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrent queries to the server."
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-msgid "Requires restart"
-msgstr "需要重启"
-
-msgid "Max threads"
-msgstr "最大线程数"
+msgid "Extract SVG ViewBox..."
+msgstr "提取 SVG ViewBox..."
 
-msgid "Maximum number of boxes to download for each pan/zoom."
-msgstr ""
+msgid "Extract best fitting boundary..."
+msgstr "提取最合适的边界..."
 
-msgid "Max download boxes"
-msgstr ""
+msgid "Create boundary"
+msgstr "建立边界"
 
-msgid ""
-"Time in milliseconds after a pan/zoom before it starts downloading. "
-"Additional changes in the viewport in the waiting time will reset the timer."
-msgstr ""
+msgid "Contacting cadastre WMS ..."
+msgstr "正在连接 cadastre WMS ..."
 
-msgid "Wait time (milliseconds)"
-msgstr "等待时间(毫秒)"
+msgid "Image already loaded"
+msgstr "图片已加载"
 
 msgid ""
-"How much extra area around the viewport is it going to download. Setting "
-"this to 0 will not download any extra data."
-msgstr ""
-
-msgid "Extra download area"
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
 msgstr ""
 
 msgid ""
-"Max area to download in degrees^2. Increasing this number will cause the "
-"plugin to download areas when you are zoomed far out."
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
 
-msgid "Max download area"
-msgstr "最大下载区域"
-
-msgid "The strategy for finding what areas to request from the server."
-msgstr ""
+msgid "Extract commune boundary"
+msgstr "提取公共边界"
 
-msgid "Download strategy"
-msgstr "下载策略"
+msgid "Only on vectorized layers"
+msgstr "只在矢量图层"
 
-msgid ""
-"Suppress the progress monitor that is shown when downloading. If this option "
-"is selected there is no indication that something is being done, and no way "
-"to cancel the download."
+msgid "Cancel current grab"
 msgstr ""
 
-msgid "Split area"
-msgstr "分离区域"
-
-msgid "Splits an area by an untagged way."
-msgstr "以未加标签的路径分离出区域。"
-
-msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
-"Remove the area from the relation before splitting it."
+msgid "Cancel current grab (only vector images)"
 msgstr ""
-"选定的区域不能分离,因为它是某个关系的成员。\n"
-"在分离它之前,请先将区域自关系中删除。"
-
-msgid "TangoGPS Files (*.log)"
-msgstr "TangoGPS 文件(*.log)"
 
-msgid "Coordinates imported: "
-msgstr "输入的坐标: "
+msgid "Cadastre grab"
+msgstr ""
 
-msgid "Format errors: "
-msgstr "格式错误: "
+msgid "Download Image from French Cadastre WMS"
+msgstr "从法国 Cadastre WMS 下载图片"
 
-msgid "TangoGPS import success"
-msgstr "TangoGPS 输入成功"
+msgid "Cadastre: {0}"
+msgstr "Cadastre:{0}"
 
-msgid "TangoGPS import failure!"
-msgstr "TangoGPS 输入失败!"
+msgid "Georeference an image"
+msgstr ""
 
-msgid "TCX Files (*.tcx)"
-msgstr "TCX 文件(*.tcx)"
+msgid "Grab non-georeferenced image"
+msgstr "抓取非地理参照的图片"
 
-msgid "Download along..."
-msgstr "沿线下载..."
+msgid "Georeferencing interrupted"
+msgstr "地理参照被中断"
 
-msgid "Download OSM data along the selected ways."
-msgstr "沿着选定的路径下载 OSM 数据。"
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
+msgstr ""
+"这张图片包含地理参照数据。\n"
+"您是否想要使用它们?"
 
-msgid "Download Along"
-msgstr "沿线下载"
+msgid "Load layer from cache"
+msgstr "从缓存中加载图层"
 
-msgid "Please select 1 or more ways to download along"
-msgstr "请选择 1 或多条路径来沿着下载"
+msgid "Load location from cache (only if cache is enabled)"
+msgstr "从缓存加载位置(只有在缓存已启用时)"
 
-msgid "Download from OSM along selected ways"
-msgstr "沿选定的路径从 OSM 下载"
+msgid "{0} not allowed with the current projection"
+msgstr "{0} 不允许使用目前的投影法"
 
-msgid "{0} intermediate nodes to download."
-msgstr "要下载 {0} 个中间的节点。"
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
+msgstr "不能加载缓存 {0},因为与目前的投影法区域不相容"
 
-msgid "between {0} {1} and {2} {3}"
-msgstr "在 {0} {1} 和 {2} {3} 之间"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgstr "选定的文件 {0} 不是这个插件的缓存文件(无效的字节)"
 
-msgid "  adding {0} {1}"
-msgstr "  正在添加 {0} {1}"
+msgid "The location {0} is already on screen. Cache not loaded."
+msgstr "位置 {0} 已经在画面上。缓存未加载。"
 
-msgid "EditGpx"
-msgstr "编辑Gpx"
+msgid "(optional)"
+msgstr "(选择性的)"
 
-msgid "Layer for editing GPX tracks"
-msgstr "编辑 GPX 轨迹的图层"
+msgid "Change location"
+msgstr "改变位置"
 
-msgid "Convert to GPX layer with anonymised time"
-msgstr "转换为没有时间的 GPX 图层"
+msgid "Set a new location for the next request"
+msgstr "为下个要求设定新的位置"
 
-msgid "edit gpx tracks"
-msgstr "编辑 gpx 轨迹"
+msgid "Add a new municipality layer"
+msgstr "添加新的自治区图层"
 
-msgid "Import path from GPX layer"
-msgstr "从 GPX 图层输入路径"
+msgid "Commune"
+msgstr ""
 
-msgid "Drop existing path"
-msgstr "放弃现有的路径"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
+msgstr "<html>输入镇、乡或城市名称。<br>使用在 www.cadastre.gouv.fr 已知的语法及标点。</html>"
 
-msgid "No GPX data layer found."
-msgstr "找不到 GPX 数据图层。"
+msgid "Departement"
+msgstr ""
 
-msgid "External tool error"
-msgstr "外部工具错误"
+msgid "<html>Departement number (optional)</html>"
+msgstr ""
 
-msgid "Error executing the script:"
-msgstr "执行脚本时发生错误:"
+msgid "Add new layer"
+msgstr "添加新的图层"
 
-msgid ""
-"Child script have returned invalid data.\n"
-"\n"
-"stderr contents:"
+msgid "Open Cadastre Preferences"
 msgstr ""
-"子脚本传回了无效的数据。\n"
-"\n"
-"标准错误内容为:"
-
-msgid "exttool:{0}"
-msgstr "外部工具:{0}"
 
-msgid "External Tool: {0}"
-msgstr "外部工具:{0}"
+msgid "Refine georeferencing"
+msgstr ""
 
-msgid "Edit tool"
-msgstr "编辑工具"
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
 
-msgid "CmdLine:"
-msgstr "命令列:"
+msgid "Reset cookie"
+msgstr "重设 cookie"
 
-msgid "External tools"
-msgstr "外部工具"
+msgid "Get a new cookie (session timeout)"
+msgstr "取得新的 cookie(会话超时)"
 
-msgid "Delete tool \"{0}\"?"
-msgstr "是否删除工具“{0}”?"
+msgid "Save image as..."
+msgstr "图像另存为..."
 
-msgid "Are you sure?"
-msgstr "您确定吗?"
+msgid "PNG files (*.png)"
+msgstr "PNG 文件(*.png)"
 
-msgid "New tool..."
-msgstr "新工具..."
+msgid "GeoTiff files (*.tif)"
+msgstr "GeoTiff 文件(*.tif)"
 
-msgid "Install"
-msgstr "安装"
+msgid "Export image (only raster images)"
+msgstr ""
 
-msgid "Public"
-msgstr "公开"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"点击剪裁图片的第一个角落\n"
+"(需要两个点)"
 
-msgid "Could not get server response, check logs"
-msgstr "无法获取服务器响应,检查日志"
+msgid "Image cropping"
+msgstr "图片剪裁"
 
-msgid "Failed to login as {0}:"
-msgstr "无法以 {0} 登录:"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
 
-msgid "The server did not return user ID"
-msgstr "服务器未返回用户ID"
+msgid "Image georeferencing"
+msgstr "图片地理参照"
 
-msgid "Failed to get messages as {0}:"
-msgstr "无法以 {0} 获取信息:"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"您是否想要完全取消或是\n"
+"要再试一次 "
 
-msgid "GeoChat"
-msgstr "GeoChat"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
 
-msgid "Open GeoChat panel"
-msgstr "打开 GeoChat 面板"
+msgid "Enter cadastre east,north position"
+msgstr "输入 cadastre 东,北 方位置"
 
-msgid "Zoom in to see messages"
-msgstr "放大查看消息"
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(警告:检验有箭头的北方!!)"
 
-msgid "Login"
-msgstr "登录"
+msgid "East"
+msgstr "东"
 
-msgid "Enable autologin"
-msgstr "启用自动登录"
+msgid "I use the mouse"
+msgstr "我使用鼠标"
 
-msgid "{0} user"
-msgid_plural "{0} users"
-msgstr[0] "{0} 位用户"
+msgid "Set {0} Lambert coordinates"
+msgstr "设定 {0} 兰勃特坐标"
 
-msgid "not logged in"
-msgstr "未登录"
+msgid "Click second corner for image cropping"
+msgstr "点击剪裁图片的第二个角落"
 
-msgid "Failed to log in to GeoChat:"
-msgstr "无法登录 GeoChat:"
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr ""
 
-msgid "Failed to send message:"
-msgstr "无法发送信息:"
+msgid "Adjust WMS"
+msgstr "调整 WMS"
 
-msgid "User {0} has left"
-msgstr "用户 {0} 已离开"
+msgid "Adjust the position of the WMS layer (saved for raster images only)"
+msgstr "调整 WMS 图层的位置(只能为点阵图像保存)"
 
-msgid "User {0} is mapping nearby"
-msgstr "用户 {0} 正在附近绘图"
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
+msgstr ""
+"发现一个以上的 WMS 图层\n"
+"请先选择它们中的一个,然后重试"
 
-msgid "Users mapping nearby:"
-msgstr "正在附近绘图的用户:"
+msgid "Reset offset"
+msgstr "重置偏移"
 
-msgid "Private chat"
-msgstr "私聊"
+msgid "Reset offset (only vector images)"
+msgstr "重置偏移(仅矢量图像)"
 
-msgid "Close tab"
-msgstr "关闭标签"
+msgid "Blank Layer"
+msgstr "空白图层"
 
-msgid "Logout"
-msgstr "注销"
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr "WMS 图层({0}),已加载 {1} 个瓦片"
 
-msgid "Clear log"
-msgstr "清空日志"
+msgid "Is not vectorized."
+msgstr "并非矢量化的。"
 
-msgid "Show users on map"
-msgstr "在地图上显示用户"
+msgid "Bounding box: {0}"
+msgstr "限定边框:{0}"
 
-msgid "GeoJSON file"
+msgid "Image size (px): {0}/{1}"
 msgstr ""
 
-msgid "Loading json file..."
-msgstr ""
+msgid "Is vectorized."
+msgstr "是矢量化的。"
 
-msgid "Data Layer from GeoJSON: "
+msgid "Commune bbox: {0}"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
 msgstr ""
+"不支持的缓存文件版本;发现 {0},应为 {1}\n"
+"建立一个新的。"
 
-msgid "Position only"
-msgstr "只有位置"
-
-msgid "Position, Time, Date, Speed"
-msgstr "位置, 时间, 日期, 速度"
-
-msgid "Position, Time, Date, Speed, Altitude"
-msgstr "位置, 时间, 日期, 速度, 高度"
-
-msgid "A By Time"
-msgstr "A 依时间"
-
-msgid "A By Distance"
-msgstr "A 依距离"
+msgid "Cache Format Error"
+msgstr "缓存格式错误"
 
-msgid "B By Time"
-msgstr "B 依时间"
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr "缓存中的兰勃特区 {0} 与目前的兰勃特区 {1} 不相容"
 
-msgid "B By Distance"
-msgstr "B 依距离"
+msgid "Cache Lambert Zone Error"
+msgstr "缓存兰勃特区发生错误"
 
-msgid "C By Time"
-msgstr "C 依时间"
+msgid "canvec tile helper"
+msgstr "canvec 瓦片帮助"
 
-msgid "C By Distance"
-msgstr "C 依距离"
+msgid "Use"
+msgstr "使用"
 
-msgid "Data Logging Format"
-msgstr "数据记录格式"
+msgid "Please select a scheme to use."
+msgstr "请选择要使用的配置。"
 
-msgid "Disable data logging if speed falls below"
-msgstr "停用数据记录速限"
+msgid "Color Scheme"
+msgstr "色彩配置"
 
-msgid "Disable data logging if distance falls below"
-msgstr "停用数据记录距离"
+msgid "Please select the scheme to delete."
+msgstr "请选择要删除的配置。"
 
-msgid "Unknown logFormat"
-msgstr "不明的记录格式"
+msgid "Use the selected scheme from the list."
+msgstr "使用从列表选定的配置。"
 
-msgid "Port:"
-msgstr "端口:"
+msgid "Use the current colors as a new color scheme."
+msgstr "使用目前的颜色作为新的颜色配置。"
 
-msgid "refresh the port list"
-msgstr "重新整理端口列表"
+msgid "Delete the selected scheme from the list."
+msgstr "从列表中删除选定的配置。"
 
-msgid "Configure Device"
-msgstr "设定装置"
+msgid "Color Schemes"
+msgstr "颜色配置"
 
-msgid "Connection Error."
-msgstr "连接错误。"
+msgid "Conflate object pair"
+msgstr ""
 
-msgid "configure the connected DG100"
-msgstr "设定连接的 DG100"
+msgid "Added {0} object to subject layer"
+msgid_plural "Added {0} objects to subject layer"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "delete data after import"
-msgstr "输入后删除数据"
+msgid "Conflation"
+msgstr ""
 
-msgid "Importing data from device."
-msgstr "从装置输入数据"
+msgid "Activates the conflation plugin"
+msgstr ""
 
-msgid "Importing data from DG100..."
-msgstr "从 DG100 输入数据..."
+msgid "Matches"
+msgstr ""
 
-msgid "Error deleting data."
-msgstr "删除数据时发生错误。"
+msgid "Reference only"
+msgstr ""
 
-msgid "imported data from {0}"
-msgstr "数据已从 {0} 输入"
+msgid "Subject only"
+msgstr ""
 
-msgid "No data found on device."
-msgstr "在装置上找不到数据。"
+msgid "Matches ({0})"
+msgstr ""
 
-msgid "Connection failed."
-msgstr "连接失败。"
+msgid "Reference only ({0})"
+msgstr ""
 
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Subject only ({0})"
 msgstr ""
-"不能加载 rxtxSerial 程序库。如果您需要安装上的支持,试试在 http://www.raphael-mack.de/josm-"
-"globalsat-gpx-import-plugin/ 的 Globalsat 首页"
 
-msgid "Globalsat Import"
-msgstr "Globalsat 输入"
+msgid "Configure"
+msgstr "设置"
 
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr "从 Globalsat Datalogger DG100 输入数据到 GPX 图层。"
+msgid "Configure conflation options"
+msgstr ""
 
-msgid "Import"
-msgstr "输入"
+msgid "Delete {0} conflation matches"
+msgstr ""
 
-msgid "GPS Blams"
-msgstr "GPS Blams"
+msgid "Remove {0} unmatched objects"
+msgstr ""
 
-msgid "GPSBlam"
-msgstr "GPSBlam"
+msgid "Remove selected matches"
+msgstr ""
 
-msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgid "Conflate"
 msgstr ""
 
-msgid "Add EGPX layer"
-msgstr "添加 EGPX 图层"
+msgid "Conflate selected objects"
+msgstr ""
 
-msgid "GPX Data"
-msgstr "GPX 数据"
+msgid "Conflation: {0}"
+msgstr ""
 
-msgid "Classes element below root child level"
+msgid "Cannot replace geometry."
 msgstr ""
 
-msgid "Class element ({0}) outside classes element"
-msgstr "在类元素外的类元素({0})"
+msgid "Zoom to selected primitive(s)"
+msgstr ""
 
-msgid "Class element without name"
-msgstr "没有名字的类元素"
+msgid "Select selected primitive(s)"
+msgstr ""
 
-msgid "Tag element outside basetag and implication elements"
+msgid "Select the primitives currently selected in the list"
 msgstr ""
 
-msgid "Implications element below root child level"
+msgid "Match finder settings"
 msgstr ""
 
-msgid "Tag without key"
-msgstr "没有键值的标签"
+msgid "Match finder method"
+msgstr ""
 
-msgid "Tag without value (key is {0})"
-msgstr "没有键值的标签(键值为 {0})"
+msgid "Threshold distance"
+msgstr ""
 
-msgid "Closed classes while it was not open"
+msgid "Distances greater than this will result in a score of zero."
 msgstr ""
 
-msgid "Closed classes element before all class elements were closed"
+msgid "Centroid distance"
 msgstr ""
 
-msgid "Closed class element while none was open"
+msgid "Hausdorff distance"
 msgstr ""
 
-msgid "Closed basetags while it was not open"
+msgid "Configure conflation settings"
 msgstr ""
 
-msgid "Closed implications while it was not open"
+msgid "Generate matches"
 msgstr ""
 
-msgid "Tag element inside other tag element"
+msgid "Layer:"
+msgstr "图层:"
+
+msgid "{0}: 0 / {1}: 0 / {2}: 0"
+msgstr "{0}: 0 / {1}: 0 / {2}: 0"
+
+msgid "Subject"
 msgstr ""
 
-msgid "Invalid opening xml tag <{0}> in state {1}"
+msgid "Selections must be made for both reference and subject."
 msgstr ""
 
-msgid "Condition isn''t finished at </condition> tag"
+msgid "Incomplete selections"
 msgstr ""
 
-msgid "Closing tag element that was not open"
+msgid "Restore subject selection"
 msgstr ""
 
-msgid "Invalid closing xml tag </{0}> in state {1}"
+msgid "Restore reference selection"
 msgstr ""
 
-msgid "Some tags have not been closed; now in state {0}"
+msgid "Freeze subject selection"
 msgstr ""
 
-msgid "Key element without attribute k"
+msgid "No valid OSM data layer present."
 msgstr ""
 
-msgid "Condition is already finished at <{0}>"
+msgid "Error freezing selection"
 msgstr ""
 
-msgid "Unknown tag for condition: {0}"
+msgid "Nothing is selected, please try again."
 msgstr ""
 
-msgid "Element must not have children: {0}"
+msgid "Empty selection"
+msgstr "空选择范围"
+
+msgid "Freeze reference selection"
 msgstr ""
 
-msgid "Condition is already finished at </{0}>"
+msgid "{0}: {1} / {2}: {3} / {4}: {5}"
+msgstr "{0}: {1} / {2}: {3} / {4}: {5}"
+
+msgid "Invalid reference or subject"
 msgstr ""
 
-msgid "<and> needs at least one child"
-msgstr "<and> 需要至少一个子元素"
+msgid "Download OSM data continuously"
+msgstr "连续下载 OSM 数据"
 
-msgid "<or> needs at least one child"
-msgstr "<or> 需要至少一个子元素"
+msgid "Download map data continuously when paning and zooming."
+msgstr "平移和缩放时连续下载地图数据。"
 
-msgid "<not> needs at least one child"
-msgstr "<not> 需要至少一个子元素"
+msgid "Toggle the continuous download on/off"
+msgstr "切换连续下载"
 
-msgid "Wrong closing tag {0} (</{1}> expected)"
-msgstr "错误的结束标记 {0}(期望为 </{1}>)"
+msgid "Activate continuous downloads at startup."
+msgstr "启动时激活连续下载。"
 
-msgid "Condition {0} not yet finished"
-msgstr "条件 {0} 尚未结束"
+msgid "Supress the default modal progress monitor when downloading."
+msgstr ""
 
-msgid "Group not yet evaluated"
+msgid "Download Settings"
+msgstr "下载设置"
+
+msgid "Settings for the continuous download."
+msgstr "连续下载设置。"
+
+msgid ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggeling the plugin with the menu option."
 msgstr ""
 
-msgid "Collection must contain at least one condition"
-msgstr "集合必须包含至少一个条件"
+msgid ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
+msgstr ""
 
-msgid "No ruleset has been selected!"
-msgstr "没有规则集合被选定!"
+msgid "Requires restart"
+msgstr "需要重启"
 
-msgid "No ruleset"
-msgstr "没有规则集合"
+msgid "Max threads"
+msgstr "最大线程数"
+
+msgid "Maximum number of boxes to download for each pan/zoom."
+msgstr ""
+
+msgid "Max download boxes"
+msgstr ""
 
 msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
 msgstr ""
-"访问规则集合时遇到语法异常:\n"
-"{0}"
+
+msgid "Wait time (milliseconds)"
+msgstr "等待时间(毫秒)"
 
 msgid ""
-"File not found:\n"
-"{0}"
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
+msgstr ""
+
+msgid "Extra download area"
 msgstr ""
-"没有找到文件:\n"
-"{0}"
 
 msgid ""
-"Problem when accessing a file:\n"
-"{0}"
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
 msgstr ""
-"访问文件时遇到问题:\n"
-"{0}"
 
-msgid "File not found:\n"
-msgstr "没有找到文件:\n"
+msgid "Max download area"
+msgstr "最大下载区域"
 
-msgid "Couldn''t find built-in ruleset {0}"
-msgstr "无法找到内置的规则集合 {0}"
+msgid "The strategy for finding what areas to request from the server."
+msgstr ""
 
-msgid "height (m)"
-msgstr "高度(米)"
+msgid "Download strategy"
+msgstr "下载策略"
 
-msgid "width (m)"
-msgstr "宽度(米)"
+msgid ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
+msgstr ""
 
-msgid "length (m)"
-msgstr "长度(米)"
+msgid "Split area"
+msgstr "分离区域"
 
-msgid "speed (km/h)"
-msgstr "速度(千米/时)"
+msgid "Splits an area by an untagged way."
+msgstr "以未加标签的路径分离出区域。"
 
-msgid "weight (t)"
-msgstr "重量(吨)"
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
+msgstr ""
+"选定的区域不能分离,因为它是某个关系的成员。\n"
+"在分离它之前,请先将区域自关系中删除。"
 
-msgid "axleload (t)"
-msgstr "轴重(吨)"
+msgid "TangoGPS Files (*.log)"
+msgstr "TangoGPS 文件(*.log)"
 
-msgid "Bookmark name"
-msgstr "书签名称"
+msgid "Coordinates imported: "
+msgstr "输入的坐标: "
 
-msgid "Bookmark name already exists!"
-msgstr "书签名称已存在!"
+msgid "Format errors: "
+msgstr "格式错误: "
 
-msgid "Bookmark name must not contain ''{0}''!"
-msgstr "书签名称不得含有“{0}”!"
+msgid "TangoGPS import success"
+msgstr "TangoGPS 输入成功"
+
+msgid "TangoGPS import failure!"
+msgstr "TangoGPS 输入失败!"
+
+msgid "TCX Files (*.tcx)"
+msgstr "TCX 文件(*.tcx)"
+
+msgid "Download along..."
+msgstr "沿线下载..."
+
+msgid "Download OSM data along the selected ways."
+msgstr "沿着选定的路径下载 OSM 数据。"
 
-msgid "Access class"
-msgstr "通行类"
+msgid "Download Along"
+msgstr "沿线下载"
 
-msgid "Access class must not contain ''{0}''!"
-msgstr "通行类名称不得含有“{0}”!"
+msgid "Please select 1 or more ways to download along"
+msgstr "请选择 1 或多条路径来沿着下载"
 
-msgid "Access types"
-msgstr "通行类型"
+msgid "Download from OSM along selected ways"
+msgstr "沿选定的路径从 OSM 下载"
 
-msgid "Vehicle properties"
-msgstr "车辆属性"
+msgid "{0} intermediate nodes to download."
+msgstr "要下载 {0} 个中间的节点。"
 
-msgid "Road requirements"
-msgstr "道路要求"
+msgid "between {0} {1} and {2} {3}"
+msgstr "在 {0} {1} 和 {2} {3} 之间"
 
-msgid "Max. incline up (%, pos.)"
-msgstr "最大上升坡度(%, pos.)"
+msgid "  adding {0} {1}"
+msgstr "  正在添加 {0} {1}"
 
-msgid "Maximum incline the vehicle can go up"
-msgstr "车辆可以上去的最大坡度"
+msgid "EditGpx"
+msgstr "编辑Gpx"
 
-msgid "Max. incline down (%, pos.)"
-msgstr "最大下降坡度(%, pos.)"
+msgid "Layer for editing GPX tracks"
+msgstr "编辑 GPX 轨迹的图层"
 
-msgid "Maximum incline the vehicle can go down"
-msgstr "车辆可以下去的最大坡度"
+msgid "Convert to GPX layer with anonymised time"
+msgstr "转换为没有时间的 GPX 图层"
 
-msgid "Surface blacklist"
-msgstr ""
+msgid "edit gpx tracks"
+msgstr "编辑 gpx 轨迹"
 
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
-msgstr ""
+msgid "Import path from GPX layer"
+msgstr "从 GPX 图层输入路径"
 
-msgid "max. tracktype grade"
-msgstr ""
+msgid "Drop existing path"
+msgstr "放弃现有的路径"
 
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
-msgstr ""
+msgid "No GPX data layer found."
+msgstr "找不到 GPX 数据图层。"
 
-msgid "Change bookmark"
-msgstr "更改书签"
+msgid "External tool error"
+msgstr "外部工具错误"
 
-msgid "Edit access parameters"
-msgstr "编辑通行参数"
+msgid "Error executing the script:"
+msgstr "执行脚本时发生错误:"
 
-msgid "Graph View Dialog"
-msgstr "图形视图对话框"
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
+msgstr ""
+"子脚本传回了无效的数据。\n"
+"\n"
+"标准错误内容为:"
 
-msgid "Open the dialog for graph view configuration."
-msgstr "打开图形视图配置对话框。"
+msgid "exttool:{0}"
+msgstr "外部工具:{0}"
 
-msgid "default"
-msgstr "默认"
+msgid "External Tool: {0}"
+msgstr "外部工具:{0}"
 
-msgid "end nodes"
-msgstr "端点"
+msgid "Edit tool"
+msgstr "编辑工具"
 
-msgid "incline"
-msgstr "倾斜"
+msgid "CmdLine:"
+msgstr "命令列:"
 
-msgid "Ruleset:"
-msgstr "规则集:"
+msgid "External tools"
+msgstr "外部工具"
 
-msgid "Parameters:"
-msgstr "参数:"
+msgid "Delete tool \"{0}\"?"
+msgstr "是否删除工具“{0}”?"
 
-msgid "Coloring:"
-msgstr "着色:"
+msgid "Are you sure?"
+msgstr "您确定吗?"
 
-msgid "Create/update graph"
-msgstr "创建/更新图形"
+msgid "New tool..."
+msgstr "新工具..."
 
-msgid "Graphview"
-msgstr "图形视图"
+msgid "Install"
+msgstr "安装"
 
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
-msgstr ""
+msgid "Public"
+msgstr "公开"
 
-msgid "Ruleset"
-msgstr "规则集"
+msgid "Could not get server response, check logs"
+msgstr "无法获取服务器响应,检查日志"
 
-msgid "Use built-in rulesets"
-msgstr "使用内置规则集"
+msgid "Failed to login as {0}:"
+msgstr "无法以 {0} 登录:"
 
-msgid "External ruleset directory:"
-msgstr "外部规则集目录:"
+msgid "The server did not return user ID"
+msgstr "服务器未返回用户ID"
 
-msgid "Select directory"
-msgstr "选择目录"
+msgid "Failed to get messages as {0}:"
+msgstr "无法以 {0} 获取信息:"
 
-msgid "Vehicle"
-msgstr "车辆"
+msgid "GeoChat"
+msgstr "GeoChat"
 
-msgid "Restore defaults"
-msgstr "恢复默认设置"
+msgid "Open GeoChat panel"
+msgstr "打开 GeoChat 面板"
 
-msgid "Visualization"
-msgstr "可视化"
+msgid "Zoom in to see messages"
+msgstr "放大查看消息"
 
-msgid "Draw directions separately"
-msgstr "单独绘制方向"
+msgid "Enable autologin"
+msgstr "启用自动登录"
 
-msgid "Node color"
-msgstr "节点颜色"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} 位用户"
 
-msgid "Arrow color"
-msgstr "箭头颜色"
+msgid "not logged in"
+msgstr "未登录"
 
-msgid "Arrowhead fill color"
-msgstr "箭头填充颜色"
+msgid "Failed to log in to GeoChat:"
+msgstr "无法登录 GeoChat:"
 
-msgid "Arrowhead placement"
-msgstr "箭头位置"
+msgid "Failed to send message:"
+msgstr "无法发送信息:"
 
-msgid "New bookmark"
-msgstr "新书签"
+msgid "User {0} has left"
+msgstr "用户 {0} 已离开"
 
-msgid "Really delete \"{0}\"?"
-msgstr "真的要删除“{0}”吗?"
+msgid "User {0} is mapping nearby"
+msgstr "用户 {0} 正在附近绘图"
 
-msgid "Bookmark deletion"
-msgstr "删除的书签"
+msgid "Users mapping nearby:"
+msgstr "正在附近绘图的用户:"
 
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
-msgstr ""
-"确定恢复默认书签?\n"
-"手动添加或编辑的书签都将会丢失!"
+msgid "Private chat"
+msgstr "私聊"
 
-msgid "Bookmark reset"
-msgstr "复位的书签"
+msgid "Close tab"
+msgstr "关闭标签"
 
-msgid "Choose node color"
-msgstr "选择节点颜色"
+msgid "Clear log"
+msgstr "清空日志"
 
-msgid "Choose arrow color"
-msgstr "选择箭头颜色"
+msgid "Show users on map"
+msgstr "在地图上显示用户"
 
-msgid "Choose arrowhead fill color"
+msgid "GeoJSON file"
 msgstr ""
 
-msgid "Routing graph calculated by the GraphView plugin"
+msgid "Loading json file..."
 msgstr ""
 
-msgid "GraphView layer is not mergable"
+msgid "Data Layer from GeoJSON: "
 msgstr ""
 
-msgid "graphview default node"
+msgid "Error loading geojson file {0}"
 msgstr ""
 
-msgid "graphview default segment"
-msgstr ""
+msgid "Position only"
+msgstr "只有位置"
 
-msgid "graphview arrowhead core"
-msgstr ""
+msgid "Position, Time, Date, Speed"
+msgstr "位置, 时间, 日期, 速度"
 
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
-msgstr ""
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr "位置, 时间, 日期, 速度, 高度"
 
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
-msgstr ""
+msgid "A By Time"
+msgstr "A 依时间"
 
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
-msgstr "速度应为无单位或以“英里/时”为单位的数字。"
+msgid "A By Distance"
+msgstr "A 依距离"
 
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
-msgstr ""
+msgid "B By Time"
+msgstr "B 依时间"
 
-msgid "Tracktype grades must be given as integers between 0 and 5."
-msgstr ""
+msgid "B By Distance"
+msgstr "B 依距离"
 
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
-msgstr ""
+msgid "C By Time"
+msgstr "C 依时间"
 
-msgid "Imagery XML Files"
-msgstr "图像 XML 文件"
+msgid "C By Distance"
+msgstr "C 依距离"
 
-msgid "Save Imagery XML file"
-msgstr "保存图像 XML 文件"
+msgid "Data Logging Format"
+msgstr "数据记录格式"
 
-msgid "XML Imagery Bounds"
-msgstr "XML 图像边界"
+msgid "Disable data logging if speed falls below"
+msgstr "停用数据记录速限"
 
-msgid "Generate Imagery XML bounds for the selection"
-msgstr ""
+msgid "Disable data logging if distance falls below"
+msgstr "停用数据记录距离"
 
-msgid "edit bounds for selected defaults"
-msgstr ""
+msgid "Unknown logFormat"
+msgstr "不明的记录格式"
 
-msgid "Download imagery XML bounds"
-msgstr "下载图像 XML 边界"
+msgid "Port:"
+msgstr "端口:"
 
-msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
-msgstr ""
+msgid "refresh the port list"
+msgstr "重新整理端口列表"
 
-msgid "Open Imagery XML file"
-msgstr "打开图像 XML 文件"
+msgid "Configure Device"
+msgstr "设定装置"
 
-msgid "Calibration Layer"
-msgstr ""
+msgid "Connection Error."
+msgstr "连接错误。"
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgid "configure the connected DG100"
+msgstr "设定连接的 DG100"
 
-msgid "A calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgid "delete data after import"
+msgstr "输入后删除数据"
 
-msgid "Change Color"
-msgstr "更改颜色"
+msgid "Importing data from device."
+msgstr "从装置输入数据"
 
-msgid "Deprecate Offset"
-msgstr "弃用偏移"
+msgid "Importing data from DG100..."
+msgstr "从 DG100 输入数据..."
 
-msgid "Are you sure this imagery offset is wrong?"
-msgstr "您确定这个图像偏移是错误的吗?"
+msgid "Error deleting data."
+msgstr "删除数据时发生错误。"
 
-msgid "Are you sure this calibration geometry is aligned badly?"
-msgstr ""
+msgid "imported data from {0}"
+msgstr "数据已从 {0} 输入"
 
-msgid "Warning: deprecation is basically irreversible!"
-msgstr ""
+msgid "No data found on device."
+msgstr "在装置上找不到数据。"
 
-msgid "To store imagery offsets you must be a registered OSM user."
-msgstr ""
+msgid "Connection failed."
+msgstr "连接失败。"
 
 msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
 msgstr ""
+"不能加载 rxtxSerial 程序库。如果您需要安装上的支持,试试在 http://www.raphael-mack.de/josm-"
+"globalsat-gpx-import-plugin/ 的 Globalsat 首页"
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
-msgstr ""
+msgid "Globalsat Import"
+msgstr "Globalsat 输入"
 
-msgid "Notifying the server of the deprecation..."
-msgstr ""
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgstr "从 Globalsat Datalogger DG100 输入数据到 GPX 图层。"
 
-msgid "Get Imagery Offset..."
-msgstr "获取图像偏移..."
+msgid "Import"
+msgstr "输入"
 
-msgid "Download offsets for current imagery from a server"
-msgstr "从服务器下载当前图像的偏移"
+msgid "GPS Blams"
+msgstr "GPS Blams"
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
-msgstr ""
+msgid "GPSBlam"
+msgstr "GPSBlam"
 
-msgid "Loading imagery offsets..."
-msgstr "正在加载图像偏移..."
+msgid "select gpx points and \"blam!\", find centre and direction of spread"
+msgstr ""
 
-msgid "Error processing XML response: {0}"
-msgstr "处理 XML 回应时发生错误:{0}"
+msgid "Add EGPX layer"
+msgstr "添加 EGPX 图层"
 
-msgid "Offset"
-msgstr "偏移"
+msgid "GPX Data"
+msgstr "GPX 数据"
 
-msgid "Imagery Offset Database"
-msgstr "图像偏移数据库"
+msgid "Classes element below root child level"
+msgstr ""
 
-msgid "mm"
-msgstr "毫米"
+msgid "Class element ({0}) outside classes element"
+msgstr "在类元素外的类元素({0})"
 
-msgid "cm"
-msgstr "厘米"
+msgid "Class element without name"
+msgstr "没有名字的类元素"
 
-msgid "m"
-msgstr "米"
+msgid "Tag element outside basetag and implication elements"
+msgstr ""
 
-msgid "km"
-msgstr "公里"
+msgid "Implications element below root child level"
+msgstr ""
 
-msgid "Calibration geometries"
-msgstr "几何校正"
+msgid "Tag without key"
+msgstr "没有键值的标签"
 
-msgid "Deprecated offsets"
-msgstr "已弃用偏移"
+msgid "Tag without value (key is {0})"
+msgstr "没有键值的标签(键值为 {0})"
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "Closed classes while it was not open"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "Closed classes element before all class elements were closed"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
-msgstr "由 {0} 于 {1} 弃用"
+msgid "Closed class element while none was open"
+msgstr ""
 
-msgid "Created by {0} on {1}"
-msgstr "由 {0} 于 {1} 创建"
+msgid "Closed basetags while it was not open"
+msgstr ""
 
-msgid "Offset Information"
-msgstr "偏移信息"
+msgid "Closed implications while it was not open"
+msgstr ""
 
-msgid "Report this offset"
-msgstr "报告偏移"
+msgid "Tag element inside other tag element"
+msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Invalid opening xml tag <{0}> in state {1}"
 msgstr ""
 
-msgid "Reporting the offset..."
-msgstr "正在报告偏移..."
+msgid "Condition isn''t finished at </condition> tag"
+msgstr ""
 
-msgid "An imagery offset of {0}"
-msgstr "{0} 的图像偏移"
+msgid "Closing tag element that was not open"
+msgstr ""
 
-msgid "Imagery ID"
-msgstr "图像 ID"
+msgid "Invalid closing xml tag </{0}> in state {1}"
+msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "Some tags have not been closed; now in state {0}"
 msgstr ""
 
-msgid "Determined right here"
+msgid "Key element without attribute k"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "Condition is already finished at <{0}>"
 msgstr ""
 
-msgid "Reason"
-msgstr "原因"
+msgid "Unknown tag for condition: {0}"
+msgstr ""
 
-msgid "This entry has been reported."
-msgstr "已报告该条目。"
+msgid "Element must not have children: {0}"
+msgstr ""
 
-msgid "Server has rejected the request"
-msgstr "服务器拒绝了报告"
+msgid "Condition is already finished at </{0}>"
+msgstr ""
 
-msgid "Unable to connect to the server"
-msgstr "无法连接到服务器"
+msgid "<and> needs at least one child"
+msgstr "<and> 需要至少一个子元素"
 
-msgid "Store Imagery Offset..."
-msgstr "存储图像偏移..."
+msgid "<or> needs at least one child"
+msgstr "<or> 需要至少一个子元素"
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
-msgstr "上传当前图像的偏移(或校准对象几何)到服务器"
+msgid "<not> needs at least one child"
+msgstr "<not> 需要至少一个子元素"
 
-msgid "Store calibration geometry"
-msgstr "存储几何校正"
+msgid "Wrong closing tag {0} (</{1}> expected)"
+msgstr "错误的结束标记 {0}(期望为 </{1}>)"
 
-msgid "Store imagery offset"
-msgstr "存储图像偏移"
+msgid "Condition {0} not yet finished"
+msgstr "条件 {0} 尚未结束"
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
-msgstr ""
+msgid "Collection must contain at least one condition"
+msgstr "集合必须包含至少一个条件"
+
+msgid "No ruleset has been selected!"
+msgstr "没有规则集合被选定!"
+
+msgid "No ruleset"
+msgstr "没有规则集合"
 
 msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
+"访问规则集合时遇到语法异常:\n"
+"{0}"
 
 msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+"File not found:\n"
+"{0}"
 msgstr ""
+"没有找到文件:\n"
+"{0}"
 
-msgid "Uploading a new offset..."
-msgstr "上传新偏移..."
-
-msgid "This string should be 3 to 200 letters long."
-msgstr "字符串应该为 3 至 200 个字符。"
-
-msgid "Adjust imagery"
-msgstr "调整图像"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "调整所选图像图层的位置"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "请选择图像图层来调整。"
-
-msgid "Start adjusting"
-msgstr "开始调整"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "当前没有图层可用来调整。"
+msgid ""
+"Problem when accessing a file:\n"
+"{0}"
+msgstr ""
+"访问文件时遇到问题:\n"
+"{0}"
 
-msgid "No layers to adjust"
-msgstr "没有图层可用来调整"
+msgid "File not found:\n"
+msgstr "没有找到文件:\n"
 
-msgid "Normal"
-msgstr "一般"
+msgid "Couldn''t find built-in ruleset {0}"
+msgstr "无法找到内置的规则集合 {0}"
 
-msgid "Rotate 90"
-msgstr "旋转 90 度"
+msgid "height (m)"
+msgstr "高度(米)"
 
-msgid "Rotate 180"
-msgstr "旋转 180 度"
+msgid "width (m)"
+msgstr "宽度(米)"
 
-msgid "Rotate 270"
-msgstr "旋转 270 度"
+msgid "length (m)"
+msgstr "长度(米)"
 
-msgid "Previous image"
-msgstr "上一幅图片"
+msgid "speed (km/h)"
+msgstr "速度(千米/时)"
 
-msgid "Next image"
-msgstr "下一幅图片"
+msgid "weight (t)"
+msgstr "重量(吨)"
 
-msgid "Rotate left"
-msgstr "向左旋转"
+msgid "axleload (t)"
+msgstr "轴重(吨)"
 
-msgid "Rotate image left"
-msgstr "将图片向左旋转"
+msgid "Bookmark name"
+msgstr "书签名称"
 
-msgid "Rotate right"
-msgstr "向右旋转"
+msgid "Bookmark name already exists!"
+msgstr "书签名称已存在!"
 
-msgid "Rotate image right"
-msgstr "将图片向右旋转"
+msgid "Bookmark name must not contain ''{0}''!"
+msgstr "书签名称不得含有“{0}”!"
 
-msgid "WayPoint Image"
-msgstr "路点图片"
+msgid "Access class"
+msgstr "通行类"
 
-msgid "Display non-geotagged photos"
-msgstr "显示无地理标记的相片"
+msgid "Access class must not contain ''{0}''!"
+msgstr "通行类名称不得含有“{0}”!"
 
-msgid "Imported Images"
-msgstr "输入的图片"
+msgid "Access types"
+msgstr "通行类型"
 
-msgid "Import vector graphics"
-msgstr "导入矢量图形"
+msgid "Vehicle properties"
+msgstr "车辆属性"
 
-msgid "Scale:"
-msgstr "比例:"
+msgid "Road requirements"
+msgstr "道路要求"
 
-msgid "unit(s) = "
-msgstr "单位 = "
+msgid "Max. incline up (%, pos.)"
+msgstr "最大上升坡度(%, pos.)"
 
-msgid "Importing..."
-msgstr "正在导入..."
+msgid "Maximum incline the vehicle can go up"
+msgstr "车辆可以上去的最大坡度"
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
-msgstr "SVG文件[ImportVec插件] (*.SVG)"
+msgid "Max. incline down (%, pos.)"
+msgstr "最大下降坡度(%, pos.)"
 
-msgid "Please open or create data layer before importing"
-msgstr ""
+msgid "Maximum incline the vehicle can go down"
+msgstr "车辆可以下去的最大坡度"
 
-msgid "Concourse wizard ..."
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "Structure type:"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "Offset into background:"
-msgstr ""
+msgid "Change bookmark"
+msgstr "更改书签"
 
-msgid "Indoor Mapping Helper"
-msgstr ""
+msgid "Edit access parameters"
+msgstr "编辑通行参数"
 
-msgid "POWER"
-msgstr ""
+msgid "Graph View Dialog"
+msgstr "图形视图对话框"
 
-msgid "Activates the plug-in"
-msgstr "激活插件"
+msgid "Open the dialog for graph view configuration."
+msgstr "打开图形视图配置对话框。"
 
-msgid "Working Level"
-msgstr ""
+msgid "default"
+msgstr "默认"
 
-msgid "Selects the working level."
-msgstr ""
+msgid "end nodes"
+msgstr "端点"
 
-msgid "Level Name"
-msgstr ""
+msgid "incline"
+msgstr "倾斜"
 
-msgid "Optional name-tag for a level."
-msgstr ""
+msgid "Ruleset:"
+msgstr "规则集:"
 
-msgid "The object preset you want to tag."
-msgstr ""
+msgid "Parameters:"
+msgstr "参数:"
 
-msgid "Sets the name tag when the room-object is selected."
-msgstr ""
+msgid "Coloring:"
+msgstr "着色:"
 
-msgid "Sets the ref tag when the room-object is selected."
-msgstr ""
+msgid "Create/update graph"
+msgstr "创建/更新图形"
 
-msgid "Apply Tags"
-msgstr ""
+msgid "Graphview"
+msgstr "图形视图"
 
-msgid "Fitting"
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
-msgstr ""
+msgid "Ruleset"
+msgstr "规则集"
 
-msgid "Level Selection"
-msgstr ""
+msgid "Use built-in rulesets"
+msgstr "使用内置规则集"
 
-msgid "Lowest Level"
-msgstr ""
+msgid "External ruleset directory:"
+msgstr "外部规则集目录:"
 
-msgid "The lowest level of your building."
-msgstr ""
+msgid "Select directory"
+msgstr "选择目录"
 
-msgid "Highest Level"
-msgstr ""
+msgid "Vehicle"
+msgstr "车辆"
 
-msgid "The highest level of your building."
-msgstr ""
+msgid "Restore defaults"
+msgstr "恢复默认设置"
 
-msgid "Toolbox for indoor mapping assistance"
-msgstr ""
+msgid "Visualization"
+msgstr "可视化"
 
-msgid "InfoMode"
-msgstr "信息模式"
+msgid "Draw directions separately"
+msgstr "单独绘制方向"
 
-msgid "GPX info mode"
-msgstr "GPX 信息模式"
+msgid "Node color"
+msgstr "节点颜色"
 
-msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
-msgstr ""
+msgid "Arrow color"
+msgstr "箭头颜色"
 
-msgid "Delete this"
-msgstr "删除这个"
+msgid "Arrowhead fill color"
+msgstr "箭头填充颜色"
 
-msgid "Delete this&older"
-msgstr "删除这个和更旧的"
+msgid "Arrowhead placement"
+msgstr "箭头位置"
 
-msgid "km/h"
-msgstr "千米/时"
+msgid "New bookmark"
+msgstr "新书签"
 
-msgid "Track name: "
-msgstr "轨迹名: "
+msgid "Really delete \"{0}\"?"
+msgstr "真的要删除“{0}”吗?"
 
-msgid "Update IRS adjustment layer"
-msgstr "更新 IRS 调整图层"
+msgid "Bookmark deletion"
+msgstr "删除的书签"
 
 msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
-"这个选项会建立含有一些路径的 IRS 调整图层。您需要先调整 WMS 图层的放置。\n"
-"产生的图层会保存为 .osm 并以 [irs rectify] 为主题发给 Komzpa (me at komzpa.net)。"
+"确定恢复默认书签?\n"
+"手动添加或编辑的书签都将会丢失!"
 
-msgid "IRS Adjustment Layer"
-msgstr "IRS 调整图层"
+msgid "Bookmark reset"
+msgstr "复位的书签"
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Choose node color"
+msgstr "选择节点颜色"
+
+msgid "Choose arrow color"
+msgstr "选择箭头颜色"
+
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "this layer is no osm data layer"
-msgstr "这个图层是不是 OSM 数据图层"
+msgid "GraphView layer is not mergable"
+msgstr ""
 
-msgid "Converting OSM graph into Channel Digraph"
+msgid "graphview default node"
 msgstr ""
 
-msgid "filtering ways"
-msgstr "正在过滤路径"
+msgid "graphview default segment"
+msgstr ""
+
+msgid "graphview arrowhead core"
+msgstr ""
+
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
+msgstr ""
 
-msgid "creating Channel-Digraph"
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
-msgid "sealing Digraph"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
+msgstr "速度应为无单位或以“英里/时”为单位的数字。"
+
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "JunctionChecking"
-msgstr "路口检查"
+msgid "Imagery XML Files"
+msgstr "图像 XML 文件"
 
-msgid "Open the junctionchecking window."
-msgstr "打开路口检查窗口。"
+msgid "Save Imagery XML file"
+msgstr "保存图像 XML 文件"
 
-msgid "junctions"
-msgstr "路口"
+msgid "XML Imagery Bounds"
+msgstr "XML 图像边界"
 
-msgid "Channel-Digraph creation"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "calculate strong connected channels"
-msgstr ""
+msgid "Download imagery XML bounds"
+msgstr "下载图像 XML 边界"
 
-msgid "Junctionchecking/junctions searching"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "order of junction (n):"
-msgstr ""
+msgid "Open Imagery XML file"
+msgstr "打开图像 XML 文件"
 
-msgid "produce OSM-Relations: junction"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "create the channel digraph"
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Check "
-msgstr "检查 "
-
-msgid "check the subset for junction properties"
-msgstr ""
+msgid "Change Color"
+msgstr "更改颜色"
 
-msgid "Search "
-msgstr "搜索 "
+msgid "Deprecate Offset"
+msgstr "弃用偏移"
 
-msgid "search for junctions in the channel subset"
-msgstr ""
+msgid "Are you sure this imagery offset is wrong?"
+msgstr "您确定这个图像偏移是错误的吗?"
 
-msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid ""
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
-msgstr "找不到方向索引“{0}”"
+msgid "Get Imagery Offset..."
+msgstr "获取图像偏移..."
 
-msgid "The starting location was not within the bbox"
-msgstr "开始的位置不在限定边框内"
+msgid "Download offsets for current imagery from a server"
+msgstr "从服务器下载当前图像的偏移"
 
-msgid "Looking for shoreline..."
-msgstr "寻找海岸线..."
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
+msgstr ""
 
-msgid "{0} nodes so far..."
-msgstr "目前 {0} 个节点..."
+msgid "Loading imagery offsets..."
+msgstr "正在加载图像偏移..."
 
-msgid "Lake Walker."
-msgstr "湖岸寻迹工具。"
+msgid "Error processing XML response: {0}"
+msgstr "处理 XML 回应时发生错误:{0}"
 
-msgid "Lake Walker"
-msgstr "湖岸寻迹"
+msgid "Offset"
+msgstr "偏移"
 
-msgid "Error creating cache directory: {0}"
-msgstr "建立缓存目录时发生错误:{0}"
+msgid "Imagery Offset Database"
+msgstr "图像偏移数据库"
 
-msgid "Tracing"
-msgstr "正在追踪"
+msgid "mm"
+msgstr "毫米"
 
-msgid "checking cache..."
-msgstr "正在检查缓存..."
+msgid "cm"
+msgstr "厘米"
 
-msgid "Running vertex reduction..."
-msgstr "正在执行端点缩减..."
+msgid "km"
+msgstr "公里"
 
-msgid "Running Douglas-Peucker approximation..."
-msgstr "执行近似道格拉斯-普克法(Douglas-Peucker)..."
+msgid "Calibration geometries"
+msgstr "几何校正"
 
-msgid "Removing duplicate nodes..."
-msgstr "正在删除重复的节点..."
+msgid "Deprecated offsets"
+msgstr "已弃用偏移"
 
-msgid "Lakewalker trace"
-msgstr "Lakewalker 轨迹"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgstr ""
 
-msgid "An unknown error has occurred"
-msgstr "发生未知错误"
+msgid ""
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
+msgstr ""
 
-msgid "east"
-msgstr "东"
+msgid "Deprecated by {0} on {1}"
+msgstr "由 {0} 于 {1} 弃用"
 
-msgid "northeast"
-msgstr "东北"
+msgid "Created by {0} on {1}"
+msgstr "由 {0} 于 {1} 创建"
 
-msgid "north"
-msgstr "北"
+msgid "Offset Information"
+msgstr "偏移信息"
 
-msgid "northwest"
-msgstr "西北"
+msgid "Report this offset"
+msgstr "报告偏移"
 
-msgid "west"
-msgstr "西"
+msgid "You are to notify moderators of this offset. Why?"
+msgstr ""
 
-msgid "southwest"
-msgstr "西南"
+msgid "Reporting the offset..."
+msgstr "正在报告偏移..."
 
-msgid "south"
-msgstr "南"
+msgid "An imagery offset of {0}"
+msgstr "{0} 的图像偏移"
 
-msgid "southeast"
-msgstr "东南"
+msgid "Imagery ID"
+msgstr "图像 ID"
 
-msgid "coastline"
-msgstr "海岸线"
+msgid "A calibration geometry of {0} nodes"
+msgstr ""
 
-msgid "land"
-msgstr "陆地"
+msgid "Determined right here"
+msgstr ""
 
-msgid "Maximum number of segments per way"
-msgstr "每条路径的最大区段数"
+msgid "Determined {0} away"
+msgstr ""
 
-msgid "Maximum number of nodes in initial trace"
-msgstr "初步轨迹的最大节点数"
+msgid "Reason"
+msgstr "原因"
 
-msgid "Maximum gray value to count as water (0-255)"
-msgstr "判断为水域的最大灰色值(0-255)"
+msgid "This entry has been reported."
+msgstr "已报告该条目。"
 
-msgid "Line simplification accuracy (degrees)"
-msgstr "线条简化准确度(度)"
+msgid "Server has rejected the request"
+msgstr "服务器拒绝了报告"
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr "Landsat 瓦片的分辨率(每一度的像素)"
+msgid "Unable to connect to the server"
+msgstr "无法连接到服务器"
 
-msgid "Size of Landsat tiles (pixels)"
-msgstr "Landsat 瓦片的大小(像素)"
+msgid "Store Imagery Offset..."
+msgstr "存储图像偏移..."
 
-msgid "Shift all traces to east (degrees)"
-msgstr "所有轨迹向东平移(度)"
+msgid ""
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
+msgstr "上传当前图像的偏移(或校准对象几何)到服务器"
 
-msgid "Shift all traces to north (degrees)"
-msgstr "所有轨迹向北平移(度)"
+msgid "Store calibration geometry"
+msgstr "存储几何校正"
 
-msgid "Direction to search for land"
-msgstr "查找陆地的方向"
+msgid "Store imagery offset"
+msgstr "存储图像偏移"
 
-msgid "Tag ways as"
-msgstr "将路径标记为"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
+msgstr ""
 
-msgid "WMS Layer"
-msgstr "WMS 图层"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
+msgstr ""
 
-msgid "Maximum cache size (MB)"
-msgstr "最大缓存大小(MB)"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
+msgstr ""
 
-msgid "Maximum cache age (days)"
-msgstr "最大缓存留存时间(天)"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
+msgstr ""
 
-msgid "Source text"
-msgstr "来源文字"
+msgid "Uploading a new offset..."
+msgstr "上传新偏移..."
 
-msgid "Lakewalker Plugin Preferences"
-msgstr "Lakewalker 插件首选项"
+msgid "This string should be 3 to 200 letters long."
+msgstr "字符串应该为 3 至 200 个字符。"
 
-msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "用来追踪 Landsat 图库中水域的插件。"
+msgid "Adjust imagery"
+msgstr "调整图像"
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
-msgstr "在每条产生的路径中允许的最大区段数。默认为 250。"
+msgid "Adjust the position of the selected imagery layer"
+msgstr "调整所选图像图层的位置"
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
-msgstr "在简化线条前产生最大的节点数目。默认值为 50000。"
+msgid "Please select the imagery layer to adjust."
+msgstr "请选择图像图层来调整。"
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
-msgstr "被认定为水域的最大灰色值(基于 Landsat IR-1 数据)。可以在范围 0-255。默认值为 90。"
+msgid "Start adjusting"
+msgstr "开始调整"
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
-msgstr ""
-"Douglas-Peucker 线条简化的准确度,以度为测量单位。<br>较低的数值会产生较多的节点,和更准确的线条。默认值为 0.0003。"
+msgid "There are currently no imagery layer to adjust."
+msgstr "当前没有图层可用来调整。"
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
-msgstr "Landsat 瓦片的解析度,以每一度像素为测量单位。默认值为 4000。"
+msgid "No layers to adjust"
+msgstr "没有图层可用来调整"
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr "一个 landsat 瓦片的大小,以像素为测量单位。默认值为 2000。"
+msgid "Normal"
+msgstr "一般"
 
-msgid "Offset all points in East direction (degrees). Default 0."
-msgstr "所有点向东方移位(度)。默认值为 0。"
+msgid "Rotate 90"
+msgstr "旋转 90 度"
 
-msgid "Offset all points in North direction (degrees). Default 0."
-msgstr "所有点向北方移位(度)。默认值为 0。"
+msgid "Rotate 180"
+msgstr "旋转 180 度"
 
-msgid "Direction to search for land. Default east."
-msgstr "查找陆地方向。默认值为东方。"
+msgid "Rotate 270"
+msgstr "旋转 270 度"
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr "将路径加上标签成为水域、海岸线、陆地或都不是。默认值为水域。"
+msgid "Previous image"
+msgstr "上一幅图片"
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr "再次追踪时要使用的 WMS 图层。默认值为 IR1。"
+msgid "Next image"
+msgstr "下一幅图片"
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr "每个缓存目录的最大容量(字节)。默认值为 300MB"
+msgid "Rotate left"
+msgstr "向左旋转"
 
-msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "每个缓存文件留存的最大天数。默认值为 100"
+msgid "Rotate image left"
+msgstr "将图片向左旋转"
 
-msgid "Data source text. Default is Landsat."
-msgstr "数据来源文字。默认值为 Landsat。"
+msgid "Rotate right"
+msgstr "向右旋转"
 
-msgid "Downloading image tile..."
-msgstr "正在下载图片瓦片..."
+msgid "Rotate image right"
+msgstr "将图片向右旋转"
 
-msgid "Could not acquire image"
-msgstr "无法获得图片"
+msgid "WayPoint Image"
+msgstr "路点图片"
 
-msgid "Connection Failed"
-msgstr "连接失败"
+msgid "Display non-geotagged photos"
+msgstr "显示无地理标记的相片"
 
-msgid "Not connected"
-msgstr "未连接"
+msgid "Imported Images"
+msgstr "输入的图片"
 
-msgid "Connecting"
-msgstr "正在连接"
+msgid "Import vector graphics"
+msgstr "导入矢量图形"
 
-msgid "Connected"
-msgstr "已连接"
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "SVG文件[ImportVec插件] (*.SVG)"
 
-msgid "no name"
-msgstr "没有名称"
+msgid "Concourse wizard ..."
+msgstr ""
 
-msgid "Live GPS"
-msgstr "Live GPS"
+msgid "Opens up a wizard to create a concourse"
+msgstr ""
 
-msgid "Show GPS data."
-msgstr "显示 GPS 数据。"
+msgid "Vertical layer:"
+msgstr ""
 
-msgid "Status"
-msgstr "状态"
+msgid "Structure type:"
+msgstr ""
 
-msgid "Way Info"
-msgstr "路径信息"
+msgid "Offset into background:"
+msgstr ""
 
-msgid "Speed"
-msgstr "速度"
+msgid "Indoor Mapping Helper"
+msgstr ""
 
-msgid "Course"
-msgstr "道路"
+msgid "POWER"
+msgstr ""
 
-msgid "LiveGPS layer"
-msgstr "LiveGPS 图层"
+msgid "Activates the plug-in"
+msgstr "激活插件"
 
-msgid "Capture GPS Track"
-msgstr "捕获 GPS 轨迹"
+msgid "Working Level"
+msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr "连接至 gpsd 服务器,并在 LiveGPS 图层中显示目前的位置。"
+msgid "Selects the working level."
+msgstr ""
 
-msgid "Center Once"
-msgstr "置中一次"
+msgid "Level Name"
+msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
-msgstr "将 LiveGPS 图层置中于目前的位置。"
+msgid "Optional name-tag for a level."
+msgstr ""
 
-msgid "Auto-Center"
-msgstr "自动居中"
+msgid "The object preset you want to tag."
+msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
-msgstr "持续将 LiveGPS 图层置中到目前的位置。"
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
 
-msgid "Open MapDust"
-msgstr "打开 MapDust"
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
 
-msgid "MapDust bug reports"
+msgid "Apply Tags"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "Fitting"
 msgstr ""
 
-msgid "Missing input data"
-msgstr "缺少输入数据"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
 
-msgid "Mapillary Images"
+msgid "Level Selection"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "Lowest Level"
 msgstr ""
 
-msgid "Total images:"
-msgstr "总图像:"
+msgid "The lowest level of your building."
+msgstr ""
 
-msgid "images"
-msgstr "图像"
+msgid "Highest Level"
+msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "The highest level of your building."
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Mapillary"
+msgid "InfoMode"
+msgstr "信息模式"
+
+msgid "GPX info mode"
+msgstr "GPX 信息模式"
+
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "Delete this"
+msgstr "删除这个"
+
+msgid "Delete this&older"
+msgstr "删除这个和更旧的"
+
+msgid "km/h"
+msgstr "千米/时"
+
+msgid "Track name: "
+msgstr "轨迹名: "
+
+msgid "Update IRS adjustment layer"
+msgstr "更新 IRS 调整图层"
+
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
+"这个选项会建立含有一些路径的 IRS 调整图层。您需要先调整 WMS 图层的放置。\n"
+"产生的图层会保存为 .osm 并以 [irs rectify] 为主题发给 Komzpa (me at komzpa.net)。"
 
-msgid "Start Mapillary layer"
+msgid "IRS Adjustment Layer"
+msgstr "IRS 调整图层"
+
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Export pictures"
-msgstr "导出图片"
+msgid "this layer is no osm data layer"
+msgstr "这个图层是不是 OSM 数据图层"
 
-msgid "Export Mapillary pictures"
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Export images"
-msgstr "导出图像"
+msgid "filtering ways"
+msgstr "正在过滤路径"
 
-msgid "Import pictures"
-msgstr "导入图片"
+msgid "creating Channel-Digraph"
+msgstr ""
 
-msgid "Import local pictures"
-msgstr "导入本地图片"
+msgid "sealing Digraph"
+msgstr ""
 
-msgid "Import pictures into Mapillary layer"
+msgid "calculating Strong Connectedness"
+msgstr ""
+
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Select pictures"
-msgstr "选择图片"
+msgid "JunctionChecking"
+msgstr "路口检查"
+
+msgid "Open the junctionchecking window."
+msgstr "打开路口检查窗口。"
+
+msgid "junctions"
+msgstr "路口"
 
-msgid "Import pictures into sequence"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Join mode"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Join/unjoin pictures"
+msgid "Junctionchecking/junctions searching"
 msgstr ""
 
-msgid "Join Mapillary pictures"
+msgid "order of junction (n):"
 msgstr ""
 
-msgid "Submit changeset"
+msgid "produce OSM-Relations: junction"
 msgstr ""
 
-msgid "Submit the current changeset"
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
 
-msgid "Submit the current changeset to Mapillary"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Upload pictures"
-msgstr "上传图片"
+msgid "Check "
+msgstr "检查 "
 
-msgid "Upload Mapillary pictures"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures."
-msgstr "上传图片。"
+msgid "Search "
+msgstr "搜索 "
 
-msgid "Walk mode"
+msgid "search for junctions in the channel subset"
 msgstr ""
 
-msgid "Start walk mode"
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Zoom to selected image"
-msgstr "缩放至选定图片"
-
-msgid "Zoom to the currently selected Mapillary image"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Uploaded {0} images"
-msgstr "已上传 {0} 张图片"
-
-msgid "Approve upload on the website"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "View in website"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Copy key"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Edit on website"
-msgstr "在网站上编辑"
-
-msgid "Current Mapillary changeset"
+msgid "Check the direction"
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Correct"
 msgstr ""
 
-msgid "Submit"
+msgid "Wrong"
 msgstr ""
 
-msgid "Export all images"
-msgstr "导出所有图像"
-
-msgid "Export selected sequence"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Export selected images"
-msgstr "导出选定图像"
-
-msgid "Rewrite imported images"
-msgstr "重写已导入图像"
-
-msgid "Select a folder"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Explore"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Select a directory"
-msgstr "选择文件夹"
-
-msgid "Speed limit"
-msgstr "限速"
-
-msgid "Give way"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "No entry"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Intersection danger"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Mandatory direction (any)"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Uneven road"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "No parking"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "No overtaking"
+msgid "Replace way"
 msgstr ""
 
-msgid "Pedestrian crossing"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "No turn"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "替换几何图形"
 
-msgid "Years"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Months"
-msgstr ""
+msgid "Direction index ''{0}'' not found"
+msgstr "找不到方向索引“{0}”"
 
-msgid "Days"
-msgstr ""
+msgid "The starting location was not within the bbox"
+msgstr "开始的位置不在限定边框内"
 
-msgid "Imported images"
-msgstr "已导入图像"
+msgid "Looking for shoreline..."
+msgstr "寻找海岸线..."
 
-msgid "Mapillary filter"
-msgstr ""
+msgid "{0} nodes so far..."
+msgstr "目前 {0} 个节点..."
 
-msgid "Open Mapillary filter dialog"
-msgstr ""
+msgid "Lake Walker."
+msgstr "湖岸寻迹工具。"
 
-msgid "Not older than: "
-msgstr ""
+msgid "Lake Walker"
+msgstr "湖岸寻迹"
 
-msgid "Downloaded images"
-msgstr "已下载图像"
+msgid "Error creating cache directory: {0}"
+msgstr "建立缓存目录时发生错误:{0}"
 
-msgid "Only images with signs"
-msgstr ""
+msgid "Tracing"
+msgstr "正在追踪"
 
-msgid "Choose signs"
-msgstr ""
+msgid "checking cache..."
+msgstr "正在检查缓存..."
 
-msgid "Mapillary history"
-msgstr ""
+msgid "Running vertex reduction..."
+msgstr "正在执行端点缩减..."
 
-msgid "Open Mapillary history dialog"
-msgstr ""
+msgid "Running Douglas-Peucker approximation..."
+msgstr "执行近似道格拉斯-普克法(Douglas-Peucker)..."
 
-msgid "Mapillary picture"
-msgstr ""
+msgid "Removing duplicate nodes..."
+msgstr "正在删除重复的节点..."
 
-msgid "Open Mapillary window"
-msgstr ""
+msgid "Lakewalker trace"
+msgstr "Lakewalker 轨迹"
 
-msgid "Mapillary dialog"
-msgstr ""
+msgid "An unknown error has occurred"
+msgstr "发生未知错误"
 
-msgid "Open Mapillary main dialog"
-msgstr ""
+msgid "east"
+msgstr "东"
 
-msgid "Next picture"
-msgstr "前一图片"
+msgid "northeast"
+msgstr "东北"
 
-msgid "Shows the next picture in the sequence"
-msgstr ""
+msgid "north"
+msgstr "北"
 
-msgid "Previous picture"
-msgstr "后一图片"
+msgid "northwest"
+msgstr "西北"
 
-msgid "Shows the previous picture in the sequence"
-msgstr ""
+msgid "west"
+msgstr "西"
 
-msgid "Jump to red"
-msgstr ""
+msgid "southwest"
+msgstr "西南"
 
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
+msgid "south"
+msgstr "南"
 
-msgid "Jump to blue"
-msgstr ""
+msgid "southeast"
+msgstr "东南"
 
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
+msgid "coastline"
+msgstr "海岸线"
 
-msgid "Stops the walk."
-msgstr ""
+msgid "land"
+msgstr "陆地"
 
-msgid "Play"
-msgstr "播放"
+msgid "Maximum number of segments per way"
+msgstr "每条路径的最大区段数"
 
-msgid "Continues with the paused walk."
-msgstr ""
+msgid "Maximum number of nodes in initial trace"
+msgstr "初步轨迹的最大节点数"
 
-msgid "Pause"
-msgstr "暂停"
+msgid "Maximum gray value to count as water (0-255)"
+msgstr "判断为水域的最大灰色值(0-255)"
 
-msgid "Pauses the walk."
-msgstr ""
+msgid "Line simplification accuracy (degrees)"
+msgstr "线条简化准确度(度)"
 
-msgid "Display hour when the picture was taken"
-msgstr ""
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr "Landsat 瓦片的分辨率(每一度的像素)"
 
-msgid "Use 24 hour format"
-msgstr ""
+msgid "Size of Landsat tiles (pixels)"
+msgstr "Landsat 瓦片的大小(像素)"
 
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
+msgid "Shift all traces to east (degrees)"
+msgstr "所有轨迹向东平移(度)"
 
-msgid "Preview images when hovering its icon"
-msgstr ""
+msgid "Shift all traces to north (degrees)"
+msgstr "所有轨迹向北平移(度)"
+
+msgid "Direction to search for land"
+msgstr "查找陆地的方向"
+
+msgid "Tag ways as"
+msgstr "将路径标记为"
+
+msgid "WMS Layer"
+msgstr "WMS 图层"
+
+msgid "Maximum cache size (MB)"
+msgstr "最大缓存大小(MB)"
+
+msgid "Maximum cache age (days)"
+msgstr "最大缓存留存时间(天)"
+
+msgid "Source text"
+msgstr "来源文字"
+
+msgid "Lakewalker Plugin Preferences"
+msgstr "Lakewalker 插件首选项"
+
+msgid "A plugin to trace water bodies on Landsat imagery."
+msgstr "用来追踪 Landsat 图库中水域的插件。"
+
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
+msgstr "在每条产生的路径中允许的最大区段数。默认为 250。"
+
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
+msgstr "在简化线条前产生最大的节点数目。默认值为 50000。"
+
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
+msgstr "被认定为水域的最大灰色值(基于 Landsat IR-1 数据)。可以在范围 0-255。默认值为 90。"
 
-msgid "Download mode"
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
+"Douglas-Peucker 线条简化的准确度,以度为测量单位。<br>较低的数值会产生较多的节点,和更准确的线条。默认值为 0.0003。"
 
-msgid "You are logged in as ''{0}''."
-msgstr "您已登录为“{0}”。"
-
-msgid "You are currently not logged in."
-msgstr "您尚未登录。"
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgstr "Landsat 瓦片的解析度,以每一度像素为测量单位。默认值为 4000。"
 
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgstr "一个 landsat 瓦片的大小,以像素为测量单位。默认值为 2000。"
 
-msgid "Upload selected sequence"
-msgstr ""
+msgid "Offset all points in East direction (degrees). Default 0."
+msgstr "所有点向东方移位(度)。默认值为 0。"
 
-msgid "Delete after upload"
-msgstr "上传后删除"
+msgid "Offset all points in North direction (degrees). Default 0."
+msgstr "所有点向北方移位(度)。默认值为 0。"
 
-msgid "Wait for full quality pictures"
-msgstr ""
+msgid "Direction to search for land. Default east."
+msgstr "查找陆地方向。默认值为东方。"
 
-msgid "Follow selected image"
-msgstr ""
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgstr "将路径加上标签成为水域、海岸线、陆地或都不是。默认值为水域。"
 
-msgid "Go forward"
-msgstr ""
+msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgstr "再次追踪时要使用的 WMS 图层。默认值为 IR1。"
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "已删除 {0} 张图像"
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr "每个缓存目录的最大容量(字节)。默认值为 300MB"
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "已导入 {0} 张图像"
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr "每个缓存文件留存的最大天数。默认值为 100"
 
-msgid "2 images joined"
-msgstr ""
+msgid "Data source text. Default is Landsat."
+msgstr "数据来源文字。默认值为 Landsat。"
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "已移动 {0} 张图像"
+msgid "Downloading image tile..."
+msgstr "正在下载图片瓦片..."
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr "无法获得图片"
 
-msgid "2 images unjoined"
-msgstr ""
+msgid "Connection Failed"
+msgstr "连接失败"
 
-msgid "everything in the visible area"
-msgstr ""
+msgid "Not connected"
+msgstr "未连接"
 
-msgid "areas with downloaded OSM-data"
-msgstr ""
+msgid "Connecting"
+msgstr "正在连接"
 
-msgid "only when manually requested"
-msgstr ""
+msgid "Connected"
+msgstr "已连接"
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
+msgid "no name"
+msgstr "没有名称"
 
-msgid "Downloading"
-msgstr "正在下载"
+msgid "Live GPS"
+msgstr "Live GPS"
 
-msgid "Select mode"
-msgstr ""
+msgid "Show GPS data."
+msgstr "显示 GPS 数据。"
 
-msgid "Mapillary login"
-msgstr ""
+msgid "Status"
+msgstr "状态"
 
-msgid "Login successful, return to JOSM."
-msgstr "登录成功,返回 JOSM。"
+msgid "Way Info"
+msgstr "路径信息"
 
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
+msgid "Speed"
+msgstr "速度"
 
-msgid "Downloading Mapillary images"
-msgstr ""
+msgid "Course"
+msgstr "道路"
 
-msgid "Total Mapillary images: {0}"
-msgstr ""
+msgid "LiveGPS layer"
+msgstr "LiveGPS 图层"
 
-msgid "Submitting Mapillary Changeset"
-msgstr ""
+msgid "Capture GPS Track"
+msgstr "捕获 GPS 轨迹"
 
-msgid "No images found"
-msgstr "没有找到图像"
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr "连接至 gpsd 服务器,并在 LiveGPS 图层中显示目前的位置。"
 
-msgid "Finished upload"
-msgstr ""
+msgid "Center Once"
+msgstr "置中一次"
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
+msgid "Center the LiveGPS layer to current position."
+msgstr "将 LiveGPS 图层置中于目前的位置。"
 
-msgid "Not Logged in to Mapillary"
-msgstr ""
+msgid "Auto-Center"
+msgstr "自动居中"
 
-msgid "Uploading: {0}"
-msgstr ""
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr "持续将 LiveGPS 图层置中到目前的位置。"
 
-msgid "The image key ''{0}'' is invalid!"
-msgstr ""
+msgid "Open MapDust"
+msgstr "打开 MapDust"
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
-msgstr ""
+msgid "Missing input data"
+msgstr "缺少输入数据"
 
 msgid "Measured values"
 msgstr "测量的数值"
@@ -29854,6 +29996,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr "已移动"
+
 msgid "rail"
 msgstr "第三轨"
 
@@ -29949,9 +30094,6 @@ msgstr "抓取"
 msgid "Join"
 msgstr "联结"
 
-msgid "moved"
-msgstr "已移动"
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30967,6 +31109,66 @@ msgstr "请选择单一、封闭、最少四个节点的路径。(或者您可
 msgid "Terrace"
 msgstr "连栋建筑"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31424,6 +31626,84 @@ msgstr "选择密钥的到期日期:"
 msgid "Create a new signing key"
 msgstr "创建新的签署密钥"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "前进"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "后退"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr "没有这条车道。"
 
@@ -32281,9 +32561,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr "替换几何图形"
-
 msgid "Replace geometry of selected object with a new one"
 msgstr "替换选定对象的几何图形"
 
@@ -32477,15 +32754,9 @@ msgstr "开始/暂停播放视频"
 msgid "Video: {0}"
 msgstr "视频:{0}"
 
-msgid "Backward"
-msgstr "后退"
-
 msgid "jumps n sec back"
 msgstr "跳至后 n 秒"
 
-msgid "Forward"
-msgstr "前进"
-
 msgid "jumps n sec forward"
 msgstr "跳至前 n 秒"
 
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 173ef05..1471e5a 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 00:30+0200\n"
-"PO-Revision-Date: 2016-08-23 18:17+0000\n"
-"Last-Translator: Supaplex <Unknown>\n"
+"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"PO-Revision-Date: 2016-09-22 18:17+0000\n"
+"Last-Translator: Sean Young <assanges at gmail.com>\n"
 "Language-Team: Traditional Chinese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-09-06 05:47+0000\n"
-"X-Generator: Launchpad (build 18179)\n"
+"X-Launchpad-Export-Date: 2016-11-07 05:16+0000\n"
+"X-Generator: Launchpad (build 18246)\n"
 "Language: zh_TW\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -202,18 +202,6 @@ msgstr "在地圖上設定選取的元件為上列清單中選取的項目。"
 msgid "Add imagery layer {0}"
 msgstr "加入圖片圖層 {0}"
 
-msgid "Error"
-msgstr "錯誤"
-
-msgid "Select image format for WMS layer"
-msgstr "選擇WMS圖層的檔案格式"
-
-msgid "Select WMS layers"
-msgstr "選擇WMS圖層"
-
-msgid "Add layers"
-msgstr "新增圖層"
-
 msgid "Invalid service URL."
 msgstr "無效的服務 URL。"
 
@@ -226,6 +214,18 @@ msgstr "無法取回 WMS 圖層清單。"
 msgid "Could not parse WMS layer list."
 msgstr "無法解析 WMS 圖層清單。"
 
+msgid "Error"
+msgstr "錯誤"
+
+msgid "Select image format for WMS layer"
+msgstr "選擇WMS圖層的檔案格式"
+
+msgid "Select WMS layers"
+msgstr "選擇WMS圖層"
+
+msgid "Add layers"
+msgstr "新增圖層"
+
 msgid "Add Node..."
 msgstr "新增節點"
 
@@ -2117,8 +2117,7 @@ msgstr "點選可移動強調的節點。按住 Ctrl 會加入新節點,或按
 
 msgid "Add a new node to way"
 msgid_plural "Add a new node to {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "新増節點至 -{0}- 項路徑"
 
 msgid "Cannot delete node that has tags"
 msgstr "不能刪除有標籤的節點"
@@ -2169,8 +2168,7 @@ msgid_plural ""
 "You moved more than {0} elements. Moving a large number of elements is often "
 "an error.\n"
 "Really move them?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "你移動了超過 {0} 項元素,這通常都是錯誤操作造成的。確定要移動嗎?"
 
 msgid "Move elements"
 msgstr "移動元素"
@@ -2230,8 +2228,7 @@ msgstr ""
 
 msgid "Add selection to {0} relation"
 msgid_plural "Add selection to {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "添加所選項目至 {0} 項關係"
 
 msgid "Delete the selected relation"
 msgstr "刪除選取的關係"
@@ -2527,7 +2524,7 @@ msgid "closed ways with an area of 100 m²"
 msgstr "區域面積為 100 m² 的封閉路徑"
 
 msgid "ways with a length of 200 m or more"
-msgstr ""
+msgstr "長度超過 200 米的路徑"
 
 msgid "state"
 msgstr "狀態"
@@ -2707,10 +2704,10 @@ msgid "Cyclic dependency between relations:"
 msgstr "在關係間有循環相依性:"
 
 msgid "Removed obsolete tags"
-msgstr ""
+msgstr "已移除逾期標籤"
 
 msgid "Fix deprecated tags"
-msgstr ""
+msgstr "修正過期標籤"
 
 msgid ""
 "<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
@@ -2794,7 +2791,7 @@ msgid "Change relation {0}"
 msgstr "改變關係 {0}"
 
 msgid "Change nodes of {0}"
-msgstr ""
+msgstr "更改 {0} 内的節點"
 
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "從節點「{1}」移除「{0}」"
@@ -2816,8 +2813,7 @@ msgstr "在關係「{2}」設定 {0}={1}"
 
 msgid "Remove \"{0}\" for {1} object"
 msgid_plural "Remove \"{0}\" for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "自 {1}  項物件移除 \"{0}\""
 
 msgid "Set {0}={1} for {2} object"
 msgid_plural "Set {0}={1} for {2} objects"
@@ -2826,13 +2822,11 @@ msgstr[1] ""
 
 msgid "Deleted {0} tags for {1} object"
 msgid_plural "Deleted {0} tags for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "自 {1} 物件移除 {0} 項標籤"
 
 msgid "Set {0} tags for {1} object"
 msgid_plural "Set {0} tags for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "自 {1} 物件建立 {0} 項標籤"
 
 msgid "Replace \"{0}\" by \"{1}\" for"
 msgstr "將「{1}」取代為「{0}」"
@@ -2912,7 +2906,7 @@ msgid_plural "Purged {0} objects"
 msgstr[0] "已清除 {0} 個物件"
 
 msgid "Removed nodes from {0}"
-msgstr ""
+msgstr "自 {0} 内移除節點"
 
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
@@ -2924,8 +2918,7 @@ msgstr[0] "縮放 {0} 節點"
 
 msgid "Selected {0} object"
 msgid_plural "Selected {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "已選取 {0} 項物件"
 
 msgid "Sequence: {0}"
 msgstr "次序:{0}"
@@ -3272,9 +3265,6 @@ msgstr ""
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
 
-msgid "No layer selected"
-msgstr ""
-
 msgid ""
 "WMTS Parser error - start element {0} has different name than end element {2}"
 msgstr ""
@@ -3675,10 +3665,10 @@ msgstr ""
 msgid "House number without street"
 msgstr ""
 
-msgid "House number ''{0}'' duplicated"
+msgid "Duplicate house numbers"
 msgstr ""
 
-msgid "Duplicate house numbers"
+msgid "House number ''{0}'' duplicated"
 msgstr ""
 
 msgid "Multiple street names in relation"
@@ -3715,6 +3705,9 @@ msgstr "海岸線"
 msgid "This test checks that coastlines are correct."
 msgstr "這會測試海岸線是否正確。"
 
+msgid "Reversed coastline: land not on left side"
+msgstr "反轉的海岸線:陸地不在左側"
+
 msgid "Unconnected coastline"
 msgstr "未連接的海岸線"
 
@@ -3724,6 +3717,9 @@ msgstr "未排序的海岸線"
 msgid "Reversed coastline"
 msgstr "反方向的海岸線"
 
+msgid "invalid coastline"
+msgstr ""
+
 msgid "Conditional Keys"
 msgstr ""
 
@@ -3760,6 +3756,12 @@ msgstr "跨越邊界"
 msgid "Crossing barriers"
 msgstr "跨越障礙物"
 
+msgid "Self crossing"
+msgstr ""
+
+msgid "Self-crossing ways"
+msgstr ""
+
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
@@ -3978,6 +3980,12 @@ msgstr "多重多邊形成員沒有有用的角色"
 msgid "Non-Way in multipolygon"
 msgstr "多重多邊形內沒有路徑"
 
+msgid "Multipolygon member(s) repeated with different role"
+msgstr ""
+
+msgid "Multipolygon member(s) repeated with same role"
+msgstr ""
+
 msgid "Missing name:* translation"
 msgstr "缺少 name:* 翻譯"
 
@@ -4190,30 +4198,30 @@ msgstr ""
 msgid "Property values contain HTML entity"
 msgstr "屬性數值含有 HTML 標記"
 
-msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
-
 msgid "Misspelled property key"
 msgstr ""
 
-msgid "Key ''{0}'' not in presets."
-msgstr "設定鍵「{0}」不在預設組合裡。"
+msgid "Key ''{0}'' looks like ''{1}''."
+msgstr ""
 
 msgid "Presets do not contain property key"
 msgstr "預設組合不包含屬性設定鍵"
 
-msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr ""
+msgid "Key ''{0}'' not in presets."
+msgstr "設定鍵「{0}」不在預設組合裡。"
 
 msgid "Misspelled property value"
 msgstr ""
 
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "設定鍵「{1}」的數值「{0}」不在預設組合中。"
+msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
+msgstr ""
 
 msgid "Presets do not contain property value"
 msgstr "預設組合不包含屬性數值"
 
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr "設定鍵「{1}」的數值「{0}」不在預設組合中。"
+
 msgid "FIXMES"
 msgstr "FIXMES"
 
@@ -4457,9 +4465,6 @@ msgstr "順序錯誤的路徑"
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "這個測試會檢查水域、陸地和海岸線路徑的方向。"
 
-msgid "Reversed coastline: land not on left side"
-msgstr "反轉的海岸線:陸地不在左側"
-
 msgid "Reversed land: land not on left side"
 msgstr "反轉的陸地:陸地不在左側"
 
@@ -4494,7 +4499,7 @@ msgid "railway"
 msgstr "鐵路"
 
 msgid "waterway"
-msgstr "航道"
+msgstr "水路"
 
 msgid "landuse"
 msgstr "土地利用"
@@ -4978,9 +4983,6 @@ msgstr "滑鼠指標所在的地理經度。"
 msgid "System of measurement changed to {0}"
 msgstr ""
 
-msgid "Layer not in list."
-msgstr "圖層不在清單中。"
-
 msgid "Default (open, closed, new)"
 msgstr ""
 
@@ -6392,6 +6394,9 @@ msgstr ""
 msgid "Sort"
 msgstr "排序"
 
+msgid "Open the note in an external browser"
+msgstr ""
+
 msgid "Object type:"
 msgstr "物件類型:"
 
@@ -6630,6 +6635,14 @@ msgstr "下載變更組合內容"
 msgid "Download the content of the selected changesets from the server"
 msgstr "從伺服器下載關於已選取變更組合的內容"
 
+msgid "Download changed objects"
+msgstr ""
+
+msgid ""
+"Download the current version of the changed objects in the selected "
+"changesets"
+msgstr ""
+
 msgid "My changesets"
 msgstr "我的變更組合"
 
@@ -7901,9 +7914,6 @@ msgstr "輸入要搜尋的位置名稱"
 msgid "Areas around places"
 msgstr "在位置附近的區域"
 
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "空指標例外(Null pointer exception),可能遺漏某些標籤。"
-
 msgid "Search ..."
 msgstr "搜尋 ..."
 
@@ -8479,6 +8489,9 @@ msgstr "未儲存的變更 - 是否在結束前儲存/上傳?"
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "未儲存的變更 - 是否在刪除前儲存/上傳?"
 
+msgid "Unsaved changes - Save/Upload before restarting?"
+msgstr ""
+
 msgid "Uploading and saving modified layers ..."
 msgstr "正在上傳與儲存修改過的圖層 ..."
 
@@ -8528,6 +8541,12 @@ msgstr "立即結束!"
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "不儲存就結束 JOSM。未儲存的變更會消失。"
 
+msgid "Restart now!"
+msgstr ""
+
+msgid "Restart JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
 msgid "Delete now!"
 msgstr "立即刪除!"
 
@@ -8540,6 +8559,12 @@ msgstr "結束前執行動作"
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr "儲存後結束 JOSM。未儲存的變更會上傳和/或儲存。"
 
+msgid "Perform actions before restarting"
+msgstr ""
+
+msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
 msgid "Perform actions before deleting"
 msgstr "刪除前執行動作"
 
@@ -10625,6 +10650,9 @@ msgstr "繪出單行道箭頭。"
 msgid "Draw segment order numbers"
 msgstr "繪製區段順序編號"
 
+msgid "Draw segment order numbers on selected way"
+msgstr ""
+
 msgid "Draw boundaries of downloaded data"
 msgstr "繪出已下載資料的邊界"
 
@@ -12724,6 +12752,9 @@ msgstr ""
 msgid "NMEA import failure!"
 msgstr "NMEA 匯入失敗!"
 
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "空指標例外(Null pointer exception),可能遺漏某些標籤。"
+
 msgid "Note Files"
 msgstr ""
 
@@ -13084,6 +13115,9 @@ msgstr "正在上傳資料 ..."
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "發現未預期的 id 0 osm 原型"
 
+msgid "Failed to evaluate {0}"
+msgstr ""
+
 msgid "Downloading data..."
 msgstr ""
 
@@ -14741,6 +14775,9 @@ msgstr ""
 msgid "Tiris: DOM (Surface model)"
 msgstr ""
 
+msgid "Tiris: contour lines"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -14852,7 +14889,10 @@ msgstr ""
 msgid "Geodatastyrelsen DTK Kort25"
 msgstr ""
 
-msgid "Geodatastyrelsen Skyggekort 1.6m"
+msgid "SDFE Terræn Skyggekort (40 cm)"
+msgstr ""
+
+msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
 msgid "Geodatastyrelsen Skærmkort"
@@ -15031,6 +15071,9 @@ msgstr ""
 msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr ""
 
+msgid "Drone Imagery Matthew(Haiti) October 2016"
+msgstr ""
+
 msgid "FÖMI ortophoto 2000"
 msgstr ""
 
@@ -15161,7 +15204,7 @@ msgid "Luxembourg Inspire Roads"
 msgstr ""
 
 msgid "Luxembourg Inspire Water"
-msgstr ""
+msgstr "盧森堡Inspire Water"
 
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
@@ -15325,18 +15368,6 @@ msgstr ""
 msgid "Freemap.sk Ski"
 msgstr ""
 
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
-
 msgid "Slovakia Historic Maps"
 msgstr ""
 
@@ -15346,6 +15377,9 @@ msgstr ""
 msgid "RABA-KGZ: Slovenia built-up areas"
 msgstr ""
 
+msgid "City of Cape Town 2015 Aerial"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
@@ -15478,6 +15512,9 @@ msgstr ""
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr ""
 
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
 msgid "7th Series (OS7)"
 msgstr ""
 
@@ -15845,6 +15882,9 @@ msgstr "這個外掛程式可以將 JOSM 中目前使用的圖層 GPS 軌跡直
 msgid "Downloads OSM data along a way"
 msgstr "沿路徑下載 OSM 資料"
 
+msgid "Dxf Import"
+msgstr ""
+
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
@@ -15961,6 +16001,9 @@ msgid ""
 "junction or searches in a subset of channels for junctions"
 msgstr ""
 
+msgid "Tools to help import Kartverket N50"
+msgstr ""
+
 msgid "Helps vectorizing WMS images."
 msgstr "協助將 WMS 圖片向量化。"
 
@@ -16158,6 +16201,11 @@ msgid "Make terraced houses out of single blocks."
 msgstr "讓連棟房屋能超出單一區塊。"
 
 msgid ""
+"Adds a todo list dialog that makes it easy to go through large lists of "
+"objects"
+msgstr ""
+
+msgid ""
 "Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
 "in OpenStreetMap"
 msgstr ""
@@ -16180,6 +16228,9 @@ msgstr ""
 msgid "Plugin to digital sign OSM-Data"
 msgstr "用來數位簽署 OSM-Data 的外掛程式"
 
+msgid "Editor to add turn lanes tags in highways"
+msgstr ""
+
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr "提供直覺的 GUI 以加入、編輯和刪除轉彎車道。"
@@ -16336,6 +16387,10 @@ msgid "No wheeled vehicle"
 msgstr ""
 
 msgctxt "riding"
+msgid "horse_riding"
+msgstr ""
+
+msgctxt "riding"
 msgid "pitch"
 msgstr "球場"
 
@@ -17157,13 +17212,13 @@ msgid "electricity"
 msgstr ""
 
 msgid "hot water"
-msgstr ""
+msgstr "熱水"
 
 msgid "hot air"
 msgstr ""
 
 msgid "cold water"
-msgstr ""
+msgstr "冷水"
 
 msgid "cold air"
 msgstr ""
@@ -17196,7 +17251,7 @@ msgid "culvert"
 msgstr ""
 
 msgid "Water access rules:"
-msgstr ""
+msgstr "取水資格"
 
 msgid "Ship"
 msgstr ""
@@ -17656,6 +17711,9 @@ msgstr ""
 msgid "Ford"
 msgstr "淺灘"
 
+msgid "stepping_stones"
+msgstr ""
+
 msgid "Ways"
 msgstr "路徑"
 
@@ -17922,7 +17980,7 @@ msgid "Rest Area"
 msgstr "休息區"
 
 msgid "Drinking Water"
-msgstr "飲水機"
+msgstr "飲用水"
 
 msgid "Traffic Signal"
 msgstr "交通號誌"
@@ -18269,11 +18327,11 @@ msgstr ""
 
 msgctxt "main group"
 msgid "Water"
-msgstr ""
+msgstr "水"
 
 msgctxt "sub group"
 msgid "Water"
-msgstr ""
+msgstr "水域"
 
 msgid "Drain"
 msgstr "排水溝"
@@ -18296,7 +18354,7 @@ msgstr "泉"
 msgid ""
 "A point where groundwater naturally flows to the surface of the earth from "
 "underground."
-msgstr ""
+msgstr "地面水自然流動時,從地下跑到地表的點"
 
 msgid "Waterfall"
 msgstr "瀑布"
@@ -18311,7 +18369,7 @@ msgid "Groyne"
 msgstr ""
 
 msgid "Breakwater"
-msgstr ""
+msgstr "堤防"
 
 msgid "Culvert"
 msgstr ""
@@ -19275,6 +19333,9 @@ msgstr "飛機跑道"
 msgid "Taxiway"
 msgstr "滑行跑道"
 
+msgid "Holding Position"
+msgstr ""
+
 msgid "Helipad"
 msgstr "直升機停機坪"
 
@@ -19945,11 +20006,11 @@ msgstr "連絡點編號"
 msgid "Point Name"
 msgstr "連絡點名稱"
 
-msgid "Phone Number"
-msgstr "電話號碼"
+msgid "Emergency Phone Number"
+msgstr ""
 
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(使用國際碼,像是 +12-345-67890)"
+msgid "(Use number as shown on plate.)"
+msgstr ""
 
 msgid "Veterinary"
 msgstr "獸醫"
@@ -19963,6 +20024,12 @@ msgstr "救護站"
 msgid "Automated Defibrillator"
 msgstr "自動心臟去顫器"
 
+msgid "Location description"
+msgstr ""
+
+msgid "Phone Number"
+msgstr "電話號碼"
+
 msgid "Located inside a building?"
 msgstr "位於建築裡面?"
 
@@ -20832,6 +20899,10 @@ msgid "university"
 msgstr ""
 
 msgctxt "building"
+msgid "college"
+msgstr ""
+
+msgctxt "building"
 msgid "hospital"
 msgstr ""
 
@@ -20916,6 +20987,10 @@ msgid "public"
 msgstr ""
 
 msgctxt "building"
+msgid "ruins"
+msgstr ""
+
+msgctxt "building"
 msgid "Levels"
 msgstr ""
 
@@ -23121,7 +23196,13 @@ msgstr "自然保育"
 msgid "Scree"
 msgstr ""
 
-msgid "An accumulation of loose rocks."
+msgid "An accumulation of loose angular rocks."
+msgstr ""
+
+msgid "Shingle"
+msgstr ""
+
+msgid "An accumulation of loose rounded rocks on a beach or riverbed."
 msgstr ""
 
 msgid "Fell"
@@ -23788,16 +23869,10 @@ msgstr "路線"
 msgid "Bicycle Route"
 msgstr "單車路線"
 
-msgid "icn"
+msgid "national"
 msgstr ""
 
-msgid "ncn"
-msgstr ""
-
-msgid "rcn"
-msgstr ""
-
-msgid "lcn"
+msgid "local"
 msgstr ""
 
 msgid "Mountain Biking Route"
@@ -23806,18 +23881,6 @@ msgstr "登山車路線"
 msgid "Hiking Route"
 msgstr "登山路線"
 
-msgid "iwn"
-msgstr ""
-
-msgid "nwn"
-msgstr ""
-
-msgid "rwn"
-msgstr ""
-
-msgid "lwn"
-msgstr ""
-
 msgid "infrastructure"
 msgstr ""
 
@@ -23830,18 +23893,6 @@ msgstr "健走路線"
 msgid "Riding Route"
 msgstr ""
 
-msgid "ihn"
-msgstr ""
-
-msgid "nhn"
-msgstr ""
-
-msgid "rhn"
-msgstr ""
-
-msgid "lhn"
-msgstr ""
-
 msgid "Piste Route"
 msgstr ""
 
@@ -24034,9 +24085,20 @@ msgstr ""
 msgid "Way with {0}. Tag each housenumber separately if possible."
 msgstr ""
 
+msgid ""
+"Object has no {0}, however, it has {1} and {2} whose value looks like a "
+"housenumber."
+msgstr ""
+
+msgid "Same value of {0} and {1}"
+msgstr ""
+
 msgid "{0} without {1}"
 msgstr ""
 
+msgid "missing tag"
+msgstr ""
+
 msgid "{0} without {1} or {2}"
 msgstr ""
 
@@ -24046,6 +24108,12 @@ msgstr ""
 msgid "{0} together with {1}"
 msgstr ""
 
+msgid "suspicious tag combination"
+msgstr ""
+
+msgid "two objects, one with {0} and one with {1} + {2} + {3}"
+msgstr ""
+
 msgid "incomplete object: only {0}"
 msgstr ""
 
@@ -24061,39 +24129,24 @@ msgstr ""
 msgid "{0} on suspicious object"
 msgstr ""
 
-msgid "restaurant without name"
-msgstr ""
-
-msgid "{0} used with {1}"
-msgstr ""
-
 msgid "natural water used for swimming pool"
 msgstr ""
 
 msgid "sport without physical feature"
 msgstr ""
 
-msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr ""
-
 msgid "alternative name without {0}"
 msgstr ""
 
 msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
-msgid "Same value of {0} and {1}"
-msgstr ""
-
 msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
 msgstr ""
 
-msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
-
 msgid "{0} on a relation without {1}"
 msgstr ""
 
@@ -24112,9 +24165,18 @@ msgstr ""
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
 msgstr ""
 
+msgid "Different number of lanes in the keys {0} and {1}"
+msgstr ""
+
+msgid "possibly missing {0} tag"
+msgstr ""
+
 msgid "{0} is deprecated"
 msgstr "{0} 已經廢棄"
 
+msgid "deprecated tagging"
+msgstr ""
+
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
 msgstr ""
 
@@ -24169,10 +24231,16 @@ msgstr ""
 msgid "Definition of {0} is unclear"
 msgstr ""
 
+msgid "{0} + {1} + {2}"
+msgstr ""
+
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
 msgstr ""
 
+msgid "{0}"
+msgstr ""
+
 msgid "key with uncommon character"
 msgstr ""
 
@@ -24188,7 +24256,7 @@ msgstr ""
 msgid "{0} is deprecated. Use the {1}: key prefix instead."
 msgstr ""
 
-msgid "questionable key (ending with a number): {0}"
+msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
@@ -24233,7 +24301,7 @@ msgstr ""
 msgid "Overlapping Identical Landuses"
 msgstr ""
 
-msgid "{0} must be connected to a way"
+msgid "isolated node which must be connected to a way"
 msgstr ""
 
 msgid "node connects waterway and bridge"
@@ -24267,6 +24335,9 @@ msgstr ""
 msgid "Coastline inside {1}"
 msgstr ""
 
+msgid "{0} should be on the node where {1} and {2} intersect"
+msgstr ""
+
 msgid "abbreviated street name"
 msgstr ""
 
@@ -24285,6 +24356,9 @@ msgstr ""
 msgid "temporary highway type"
 msgstr ""
 
+msgid "{0} used with {1}"
+msgstr ""
+
 msgid "street name contains ss"
 msgstr ""
 
@@ -24375,10 +24449,13 @@ msgstr ""
 msgid "{0} is unnecessary"
 msgstr ""
 
+msgid "unnecessary tag"
+msgstr ""
+
 msgid "{0} is unnecessary for {1}"
 msgstr ""
 
-msgid "{0}={1} makes no sense"
+msgid "{0} makes no sense"
 msgstr ""
 
 msgid "Nodes duplicating parent way tags"
@@ -24624,26 +24701,47 @@ msgstr "正在上傳 GPX 軌跡"
 msgid "Uploads traces to openstreetmap.org"
 msgstr "上傳軌跡至 openstreetmap.org"
 
-msgid "Shows elevation profile"
-msgstr "顯示海拔設定檔"
-
-msgid "Elevation Profile"
-msgstr "海拔設定檔"
+msgid "Importing..."
+msgstr "正在匯入..."
 
-msgid "Elevation Grid Layer (experimental!)"
+msgid "DXF files [ImportDxf plugin] (*.dxf)"
 msgstr ""
 
-msgid "Shows elevation grid layer"
+msgid "Please open or create data layer before importing"
 msgstr ""
 
-msgid "Elevation Grid"
+msgid "Import dxf"
 msgstr ""
 
-msgid "increase zoom level to see more detail"
-msgstr "增加縮放等級以查看更多詳細資料"
+msgid "Scale:"
+msgstr "縮放:"
 
-msgid "No SRTM data"
-msgstr ""
+msgid "unit(s) = "
+msgstr "單位 = "
+
+msgid "m"
+msgstr "m"
+
+msgid "Shows elevation profile"
+msgstr "顯示海拔設定檔"
+
+msgid "Elevation Profile"
+msgstr "海拔設定檔"
+
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "increase zoom level to see more detail"
+msgstr "增加縮放等級以查看更多詳細資料"
+
+msgid "No SRTM data"
+msgstr ""
 
 msgid "Open the elevation profile window."
 msgstr "開啟海拔設定檔視窗。"
@@ -24961,230 +25059,627 @@ msgstr "匯入地理參照的圖片"
 msgid "Error while creating image layer: "
 msgstr "在建立圖片圖層時發生錯誤: "
 
-msgid "NanoLog"
+msgid "Mapillary Images"
 msgstr ""
 
-msgid "NanoLog of {0} entries"
+msgid "Mapillary layer"
 msgstr ""
 
-msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgid "Total images:"
 msgstr ""
 
-msgid "Correlate with GPX..."
+msgid "images"
 msgstr ""
 
-msgid "Put on GPX..."
+msgid "Traffic sign font at ''{0}'' has wrong format"
 msgstr ""
 
-msgid "Correlate entries with GPS trace"
+msgid "Could not read font-file from ''{0}''"
 msgstr ""
 
-msgid "Save layer..."
+msgid "Mapillary"
 msgstr ""
 
-msgid "Save NanoLog layer"
+msgid "Create Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog panel"
+msgid "Start Mapillary layer"
 msgstr ""
 
-msgid "Open NanoLog file..."
+msgid "Download Mapillary images in current view"
 msgstr ""
 
-msgid "Could not read NanoLog file:"
+msgid "Export pictures"
 msgstr ""
 
-msgid "OSM Recommendation"
+msgid "Export Mapillary pictures"
 msgstr ""
 
-msgid "Recommend categories to your newly created instances."
+msgid "Export images"
 msgstr ""
 
-msgid "Training process configuration"
+msgid "Import pictures"
 msgstr ""
 
-msgid "Model Settings"
+msgid "Import local pictures"
 msgstr ""
 
-msgid "Select objects or create new objects and get recommendation."
+msgid "Import pictures into Mapillary layer"
 msgstr ""
 
-msgid "Add Recommendation"
+msgid "Select pictures"
 msgstr ""
 
-msgid "Add a recommended key/value pair to your object"
+msgid "Import pictures into sequence"
 msgstr ""
 
-msgid "Train a Model"
+msgid "Import pictures into Mapillary layer in a sequence"
 msgstr ""
 
-msgid "Start the training engine!"
+msgid "Join mode"
 msgstr ""
 
-msgid "Edit opening hours"
-msgstr "編輯開放小時"
+msgid "Join/unjoin pictures"
+msgstr ""
 
-msgid "Edit time-tag of selected element in a graphical interface"
-msgstr "以圖形化介面編輯選取元素的 time-tag"
+msgid "Join Mapillary pictures"
+msgstr ""
 
-msgid "edit existing tag"
+msgid "Submit changeset"
 msgstr ""
 
-msgid "edit new tag"
+msgid "Submit the current changeset"
 msgstr ""
 
-msgid "Display clock in 12h mode."
+msgid "Submit the current changeset to Mapillary"
 msgstr ""
 
-msgid "Choose key"
-msgstr "選擇設定鍵"
+msgid "Upload pictures"
+msgstr ""
 
-msgid "apply {0}"
-msgstr "套用 {0}"
+msgid "Upload Mapillary pictures"
+msgstr ""
 
-msgid "There is something wrong in the value near:"
-msgstr "有錯誤發生於數值附近:"
+msgid "Upload pictures."
+msgstr ""
 
-msgid "Info: {0}"
-msgstr "資訊:{0}"
+msgid "Walk mode"
+msgstr ""
 
-msgid "Correct the value manually and than press Enter."
-msgstr "手動修正數值後按下 Enter。"
+msgid "Start walk mode"
+msgstr ""
 
-msgid "Error in timeformat"
-msgstr "時刻格式出現錯誤"
+msgid "Zoom to selected image"
+msgstr ""
 
-msgid "open end"
-msgstr "開放結束"
+msgid "Zoom to the currently selected Mapillary image"
+msgstr ""
 
-msgid "Import Osm Inspector Bugs..."
+msgid "View in website"
 msgstr ""
 
-msgid "OsmInspector"
+msgid "Copy key"
 msgstr ""
 
-msgid "Open OsmInspector"
+msgid "Copy key tag"
 msgstr ""
 
-msgid "OsmBugInfo"
+msgid "Edit on website"
 msgstr ""
 
-msgid "Open a OSM Inspector selection list window."
+msgid "Current Mapillary changeset"
 msgstr ""
 
-msgid "Current Selected Bug Info"
+msgid "Open Mapillary changeset dialog"
 msgstr ""
 
-msgid "Prev OSMI bug"
+msgid "Mapillary changeset"
 msgstr ""
 
-msgid "Next OSMI bug"
+msgid "Submit"
 msgstr ""
 
-msgid "OSM Inspector Bugs"
+msgid "Export all images"
 msgstr ""
 
-msgid "Selected Bug Info"
+msgid "Export selected sequence"
 msgstr ""
 
-msgid "Handy Address Interpolation Functions"
-msgstr "便利住址填寫功能"
+msgid "Export selected images"
+msgstr ""
 
-msgid "Define Address Interpolation"
-msgstr "定義內插法地址"
+msgid "Rewrite imported images"
+msgstr ""
 
-msgid "Odd"
-msgstr "奇數"
+msgid "Select a folder"
+msgstr ""
 
-msgid "Even"
-msgstr "偶數"
+msgid "Explore"
+msgstr ""
 
-msgid "Alphabetic"
-msgstr "字母"
+msgid "Select a directory"
+msgstr ""
 
-msgid "Numeric"
-msgstr "數字"
+msgid "Speed limit"
+msgstr ""
 
-msgid "Actual"
-msgstr "實際"
+msgid "Give way"
+msgstr ""
 
-msgid "Estimate"
-msgstr "預計"
+msgid "No entry"
+msgstr ""
 
-msgid "Potential"
-msgstr "潛在"
+msgid "Intersection danger"
+msgstr ""
 
-msgid "Relation: {0}"
-msgstr "關係:{0}"
+msgid "Mandatory direction (any)"
+msgstr ""
 
-msgid "Associate with street using:"
-msgstr "與街道關聯的方式:"
+msgid "Uneven road"
+msgstr ""
 
-msgid "Numbering Scheme:"
-msgstr "編號規則:"
+msgid "No parking"
+msgstr ""
 
-msgid "Increment:"
-msgstr "遞增:"
+msgid "No overtaking"
+msgstr ""
 
-msgid "Starting #:"
-msgstr "開始 #:"
+msgid "Pedestrian crossing"
+msgstr ""
 
-msgid "Ending #:"
-msgstr "結尾 #:"
+msgid "No turn"
+msgstr ""
 
-msgid "Accuracy:"
-msgstr "準確度:"
+msgid "Years"
+msgstr ""
 
-msgid "Convert way to individual house numbers."
-msgstr "將路徑轉換為個別的房屋號碼。"
+msgid "Months"
+msgstr ""
 
-msgid "Will associate {0} additional house number nodes"
-msgstr "將關聯 {0} 個額外的房屋號碼節點"
+msgid "Days"
+msgstr ""
 
-msgid "City:"
-msgstr "城市:"
+msgid "Imported images"
+msgstr ""
 
-msgid "State:"
-msgstr "狀態:"
+msgid "Mapillary filter"
+msgstr ""
 
-msgid "Post Code:"
-msgstr "郵遞區號:"
+msgid "Open Mapillary filter dialog"
+msgstr ""
 
-msgid "Country:"
-msgstr "國家:"
+msgid "Not older than: "
+msgstr ""
 
-msgid "Full Address:"
-msgstr "完整地址:"
+msgid "Downloaded images"
+msgstr ""
 
-msgid "Optional Information:"
-msgstr "選擇性的資訊:"
+msgid "Only images with signs"
+msgstr ""
 
-msgid "Please select a street to associate with address interpolation way"
-msgstr "請選擇要與內插法地址的街道"
+msgid "Choose signs"
+msgstr ""
 
-msgid "Please select address interpolation way for this street"
-msgstr "請選擇這個街道的內插法地址"
+msgid "Mapillary history"
+msgstr ""
 
-msgid "Expected odd numbers for addresses"
-msgstr "預測的奇數地址"
+msgid "Open Mapillary history dialog"
+msgstr ""
 
-msgid "Expected even numbers for addresses"
-msgstr "預測的偶數地址"
+msgid "Mapillary picture"
+msgstr ""
 
-msgid "Expected valid number for increment"
+msgid "Open Mapillary window"
 msgstr ""
 
-msgid "Country code must be 2 letters"
-msgstr "國碼只能使用 2 個字元"
+msgid "Mapillary dialog"
+msgstr ""
 
-msgid "Please enter valid number for starting and ending address"
-msgstr "請輸入開始與結尾地址的有效編號"
+msgid "Open Mapillary main dialog"
+msgstr ""
 
-msgid "Alphabetic address must end with a letter"
-msgstr "字母住址必須以字母結尾"
+msgid "Next picture"
+msgstr ""
 
-msgid "Starting and ending numbers must be the same for alphabetic addresses"
-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 "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Download mode"
+msgstr ""
+
+msgid "You are logged in as ''{0}''."
+msgstr ""
+
+msgid "You are currently not logged in."
+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 "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 "everything in the visible area"
+msgstr ""
+
+msgid "areas with downloaded OSM-data"
+msgstr ""
+
+msgid "only when manually requested"
+msgstr ""
+
+msgid ""
+"The downloaded OSM area is too big. Download mode has been changed to OSM "
+"area until the layer is restarted."
+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 "The image key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The image key must not be null here!"
+msgstr ""
+
+msgid "The sequence key ''{0}'' is invalid!"
+msgstr ""
+
+msgid "The sequence key must not be null here!"
+msgstr ""
+
+msgid "NanoLog"
+msgstr ""
+
+msgid "NanoLog of {0} entries"
+msgstr ""
+
+msgid "NanoLog of {0} lines, {1} of them with coordinates."
+msgstr ""
+
+msgid "Correlate with GPX..."
+msgstr ""
+
+msgid "Put on GPX..."
+msgstr ""
+
+msgid "Correlate entries with GPS trace"
+msgstr ""
+
+msgid "Save layer..."
+msgstr ""
+
+msgid "Save NanoLog layer"
+msgstr ""
+
+msgid "Open NanoLog panel"
+msgstr ""
+
+msgid "Open NanoLog file..."
+msgstr ""
+
+msgid "Could not read NanoLog file:"
+msgstr ""
+
+msgid "OSM Recommendation"
+msgstr ""
+
+msgid "Recommend categories to your newly created instances."
+msgstr ""
+
+msgid "Training process configuration"
+msgstr ""
+
+msgid "Model Settings"
+msgstr ""
+
+msgid "Select objects or create new objects and get recommendation."
+msgstr ""
+
+msgid "Add Recommendation"
+msgstr ""
+
+msgid "Add a recommended key/value pair to your object"
+msgstr ""
+
+msgid "Train a Model"
+msgstr ""
+
+msgid "Start the training engine!"
+msgstr ""
+
+msgid "Edit opening hours"
+msgstr "編輯開放小時"
+
+msgid "Edit time-tag of selected element in a graphical interface"
+msgstr "以圖形化介面編輯選取元素的 time-tag"
+
+msgid "edit existing tag"
+msgstr ""
+
+msgid "edit new tag"
+msgstr ""
+
+msgid "Display clock in 12h mode."
+msgstr ""
+
+msgid "Choose key"
+msgstr "選擇設定鍵"
+
+msgid "apply {0}"
+msgstr "套用 {0}"
+
+msgid "There is something wrong in the value near:"
+msgstr "有錯誤發生於數值附近:"
+
+msgid "Info: {0}"
+msgstr "資訊:{0}"
+
+msgid "Correct the value manually and than press Enter."
+msgstr "手動修正數值後按下 Enter。"
+
+msgid "Error in timeformat"
+msgstr "時刻格式出現錯誤"
+
+msgid "open end"
+msgstr "開放結束"
+
+msgid "Import Osm Inspector Bugs..."
+msgstr ""
+
+msgid "OsmInspector"
+msgstr ""
+
+msgid "Open OsmInspector"
+msgstr ""
+
+msgid "OsmBugInfo"
+msgstr ""
+
+msgid "Open a OSM Inspector selection list window."
+msgstr ""
+
+msgid "Current Selected Bug Info"
+msgstr ""
+
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
+msgid "Handy Address Interpolation Functions"
+msgstr "便利住址填寫功能"
+
+msgid "Define Address Interpolation"
+msgstr "定義內插法地址"
+
+msgid "Odd"
+msgstr "奇數"
+
+msgid "Even"
+msgstr "偶數"
+
+msgid "Alphabetic"
+msgstr "字母"
+
+msgid "Numeric"
+msgstr "數字"
+
+msgid "Actual"
+msgstr "實際"
+
+msgid "Estimate"
+msgstr "預計"
+
+msgid "Potential"
+msgstr "潛在"
+
+msgid "Relation: {0}"
+msgstr "關係:{0}"
+
+msgid "Associate with street using:"
+msgstr "與街道關聯的方式:"
+
+msgid "Numbering Scheme:"
+msgstr "編號規則:"
+
+msgid "Increment:"
+msgstr "遞增:"
+
+msgid "Starting #:"
+msgstr "開始 #:"
+
+msgid "Ending #:"
+msgstr "結尾 #:"
+
+msgid "Accuracy:"
+msgstr "準確度:"
+
+msgid "Convert way to individual house numbers."
+msgstr "將路徑轉換為個別的房屋號碼。"
+
+msgid "Will associate {0} additional house number nodes"
+msgstr "將關聯 {0} 個額外的房屋號碼節點"
+
+msgid "City:"
+msgstr "城市:"
+
+msgid "State:"
+msgstr "狀態:"
+
+msgid "Post Code:"
+msgstr "郵遞區號:"
+
+msgid "Country:"
+msgstr "國家:"
+
+msgid "Full Address:"
+msgstr "完整地址:"
+
+msgid "Optional Information:"
+msgstr "選擇性的資訊:"
+
+msgid "Please select a street to associate with address interpolation way"
+msgstr "請選擇要與內插法地址的街道"
+
+msgid "Please select address interpolation way for this street"
+msgstr "請選擇這個街道的內插法地址"
+
+msgid "Expected odd numbers for addresses"
+msgstr "預測的奇數地址"
+
+msgid "Expected even numbers for addresses"
+msgstr "預測的偶數地址"
+
+msgid "Expected valid number for increment"
+msgstr ""
+
+msgid "Country code must be 2 letters"
+msgstr "國碼只能使用 2 個字元"
+
+msgid "Please enter valid number for starting and ending address"
+msgstr "請輸入開始與結尾地址的有效編號"
+
+msgid "Alphabetic address must end with a letter"
+msgstr "字母住址必須以字母結尾"
+
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgstr "開始與結尾的編號必須屬於同一個字母地址"
 
 msgid "Starting address letter must be less than ending address letter"
 msgstr "開始住址的字母必須少於結尾住址的字母"
@@ -26681,9 +27176,6 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
-msgid "Login"
-msgstr ""
-
 msgid "Enable autologin"
 msgstr ""
 
@@ -26716,9 +27208,6 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Logout"
-msgstr ""
-
 msgid "Clear log"
 msgstr ""
 
@@ -26925,1379 +27414,1025 @@ msgstr ""
 msgid "Wrong closing tag {0} (</{1}> expected)"
 msgstr ""
 
-msgid "Condition {0} not yet finished"
-msgstr ""
-
-msgid "Group not yet evaluated"
-msgstr ""
-
-msgid "Collection must contain at least one condition"
-msgstr ""
-
-msgid "No ruleset has been selected!"
-msgstr ""
-
-msgid "No ruleset"
-msgstr ""
-
-msgid ""
-"Syntax exception in access ruleset:\n"
-"{0}"
-msgstr ""
-
-msgid ""
-"File not found:\n"
-"{0}"
-msgstr ""
-
-msgid ""
-"Problem when accessing a file:\n"
-"{0}"
-msgstr ""
-"存取檔案時的問題:\n"
-"{0}"
-
-msgid "File not found:\n"
-msgstr ""
-
-msgid "Couldn''t find built-in ruleset {0}"
-msgstr ""
-
-msgid "height (m)"
-msgstr ""
-
-msgid "width (m)"
-msgstr ""
-
-msgid "length (m)"
-msgstr ""
-
-msgid "speed (km/h)"
-msgstr ""
-
-msgid "weight (t)"
-msgstr ""
-
-msgid "axleload (t)"
-msgstr ""
-
-msgid "Bookmark name"
-msgstr ""
-
-msgid "Bookmark name already exists!"
-msgstr ""
-
-msgid "Bookmark name must not contain ''{0}''!"
-msgstr ""
-
-msgid "Access class"
-msgstr "存取類別"
-
-msgid "Access class must not contain ''{0}''!"
-msgstr "存取類別必須不包今「{0}」!"
-
-msgid "Access types"
-msgstr "存取類型"
-
-msgid "Vehicle properties"
-msgstr ""
-
-msgid "Road requirements"
-msgstr ""
-
-msgid "Max. incline up (%, pos.)"
-msgstr ""
-
-msgid "Maximum incline the vehicle can go up"
-msgstr ""
-
-msgid "Max. incline down (%, pos.)"
-msgstr ""
-
-msgid "Maximum incline the vehicle can go down"
-msgstr ""
-
-msgid "Surface blacklist"
-msgstr ""
-
-msgid ""
-"List of surfaces the vehicle cannot use, values are separated by semicolons "
-"(;)"
-msgstr ""
-
-msgid "max. tracktype grade"
-msgstr ""
-
-msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
-msgstr ""
-
-msgid "Change bookmark"
-msgstr ""
-
-msgid "Edit access parameters"
-msgstr "編輯存取參數"
-
-msgid "Graph View Dialog"
-msgstr ""
-
-msgid "Open the dialog for graph view configuration."
-msgstr ""
-
-msgid "default"
-msgstr ""
-
-msgid "end nodes"
-msgstr ""
-
-msgid "incline"
-msgstr ""
-
-msgid "Ruleset:"
-msgstr ""
-
-msgid "Parameters:"
-msgstr ""
-
-msgid "Coloring:"
-msgstr ""
-
-msgid "Create/update graph"
-msgstr ""
-
-msgid "Graphview"
-msgstr ""
-
-msgid "Settings for the Graphview plugin that visualizes routing graphs."
-msgstr ""
-
-msgid "Ruleset"
-msgstr ""
-
-msgid "Use built-in rulesets"
-msgstr ""
-
-msgid "External ruleset directory:"
-msgstr ""
-
-msgid "Select directory"
-msgstr ""
-
-msgid "Vehicle"
-msgstr ""
-
-msgid "Restore defaults"
-msgstr ""
-
-msgid "Visualization"
-msgstr ""
-
-msgid "Draw directions separately"
-msgstr ""
-
-msgid "Node color"
-msgstr ""
-
-msgid "Arrow color"
-msgstr ""
-
-msgid "Arrowhead fill color"
-msgstr ""
-
-msgid "Arrowhead placement"
-msgstr ""
-
-msgid "New bookmark"
-msgstr ""
-
-msgid "Really delete \"{0}\"?"
-msgstr ""
-
-msgid "Bookmark deletion"
-msgstr ""
-
-msgid ""
-"Really restore default bookmarks?\n"
-"All manually added or edited bookmarks will be lost!"
-msgstr ""
-
-msgid "Bookmark reset"
-msgstr ""
-
-msgid "Choose node color"
-msgstr ""
-
-msgid "Choose arrow color"
-msgstr ""
-
-msgid "Choose arrowhead fill color"
-msgstr ""
-
-msgid "Routing graph calculated by the GraphView plugin"
-msgstr ""
-
-msgid "GraphView layer is not mergable"
-msgstr ""
-
-msgid "graphview default node"
-msgstr ""
-
-msgid "graphview default segment"
-msgstr ""
-
-msgid "graphview arrowhead core"
-msgstr ""
-
-msgid ""
-"Weights must be given as positive decimal numbers with unit \"t\" or without "
-"unit."
-msgstr ""
-
-msgid ""
-"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
-"\"mi\" or without unit.\n"
-"Alternatively, the format FEET'' INCHES\" can be used."
-msgstr ""
-
-msgid ""
-"Speeds should be given as numbers without unit or as numbers followed by "
-"\"mph\"."
-msgstr ""
-
-msgid ""
-"Inclines must be given as positive decimal numbers with followed by \"%\"."
-msgstr ""
-
-msgid "Tracktype grades must be given as integers between 0 and 5."
-msgstr ""
-
-msgid ""
-"Surface values must not contain any of the following characters: '','', '' "
-"'{' '',  '' '}' '', ''='', ''|''"
+msgid "Condition {0} not yet finished"
 msgstr ""
 
-msgid "Imagery XML Files"
+msgid "Group not yet evaluated"
 msgstr ""
 
-msgid "Save Imagery XML file"
+msgid "Collection must contain at least one condition"
 msgstr ""
 
-msgid "XML Imagery Bounds"
+msgid "No ruleset has been selected!"
 msgstr ""
 
-msgid "Generate Imagery XML bounds for the selection"
+msgid "No ruleset"
 msgstr ""
 
-msgid "edit bounds for selected defaults"
+msgid ""
+"Syntax exception in access ruleset:\n"
+"{0}"
 msgstr ""
 
-msgid "Download imagery XML bounds"
+msgid ""
+"File not found:\n"
+"{0}"
 msgstr ""
 
 msgid ""
-"Validating error in file {0}:\n"
-"{1}\n"
-"Do you want to continue without validating the file ?"
+"Problem when accessing a file:\n"
+"{0}"
 msgstr ""
+"存取檔案時的問題:\n"
+"{0}"
 
-msgid "Open Imagery XML file"
+msgid "File not found:\n"
 msgstr ""
 
-msgid "Calibration Layer"
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
-msgid "A deprecated calibration geometry of {0} nodes by {1}"
+msgid "height (m)"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes by {1}"
+msgid "width (m)"
 msgstr ""
 
-msgid "Change Color"
+msgid "length (m)"
 msgstr ""
 
-msgid "Deprecate Offset"
+msgid "speed (km/h)"
 msgstr ""
 
-msgid "Are you sure this imagery offset is wrong?"
+msgid "weight (t)"
 msgstr ""
 
-msgid "Are you sure this calibration geometry is aligned badly?"
+msgid "axleload (t)"
 msgstr ""
 
-msgid "Warning: deprecation is basically irreversible!"
+msgid "Bookmark name"
 msgstr ""
 
-msgid "To store imagery offsets you must be a registered OSM user."
+msgid "Bookmark name already exists!"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this imagery offset as deprecated"
+msgid "Bookmark name must not contain ''{0}''!"
 msgstr ""
 
-msgid ""
-"Please enter the reason why you mark this calibration geometry as deprecated"
+msgid "Access class"
+msgstr "存取類別"
+
+msgid "Access class must not contain ''{0}''!"
+msgstr "存取類別必須不包今「{0}」!"
+
+msgid "Access types"
+msgstr "存取類型"
+
+msgid "Vehicle properties"
 msgstr ""
 
-msgid "Notifying the server of the deprecation..."
+msgid "Road requirements"
 msgstr ""
 
-msgid "Get Imagery Offset..."
+msgid "Max. incline up (%, pos.)"
 msgstr ""
 
-msgid "Download offsets for current imagery from a server"
+msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
-msgid ""
-"No data for this region. Please adjust imagery layer and upload an offset."
+msgid "Max. incline down (%, pos.)"
 msgstr ""
 
-msgid "Loading imagery offsets..."
+msgid "Maximum incline the vehicle can go down"
 msgstr ""
 
-msgid "Error processing XML response: {0}"
+msgid "Surface blacklist"
 msgstr ""
 
-msgid "Offset"
+msgid ""
+"List of surfaces the vehicle cannot use, values are separated by semicolons "
+"(;)"
 msgstr ""
 
-msgid "Imagery Offset Database"
+msgid "max. tracktype grade"
 msgstr ""
 
-msgid "mm"
+msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
 
-msgid "cm"
+msgid "Change bookmark"
 msgstr ""
 
-msgid "m"
-msgstr "m"
+msgid "Edit access parameters"
+msgstr "編輯存取參數"
 
-msgid "km"
+msgid "Graph View Dialog"
 msgstr ""
 
-msgid "Calibration geometries"
+msgid "Open the dialog for graph view configuration."
 msgstr ""
 
-msgid "Deprecated offsets"
+msgid "default"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has been shifted to presumably match\n"
-"OSM data in the area. Please check that the offset is still valid\n"
-"by downloading GPS tracks and comparing them and OSM data to the imagery."
+msgid "end nodes"
 msgstr ""
 
-msgid ""
-"A layer has been added with a calibration geometry. Hide data layers,\n"
-"find the corresponding feature on the imagery layer and move it accordingly."
+msgid "incline"
 msgstr ""
 
-msgid "Deprecated by {0} on {1}"
+msgid "Ruleset:"
 msgstr ""
 
-msgid "Created by {0} on {1}"
+msgid "Parameters:"
 msgstr ""
 
-msgid "Offset Information"
+msgid "Coloring:"
 msgstr ""
 
-msgid "Report this offset"
+msgid "Create/update graph"
 msgstr ""
 
-msgid "You are to notify moderators of this offset. Why?"
+msgid "Graphview"
 msgstr ""
 
-msgid "Reporting the offset..."
+msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-msgid "An imagery offset of {0}"
+msgid "Ruleset"
 msgstr ""
 
-msgid "Imagery ID"
+msgid "Use built-in rulesets"
 msgstr ""
 
-msgid "A calibration geometry of {0} nodes"
+msgid "External ruleset directory:"
 msgstr ""
 
-msgid "Determined right here"
+msgid "Select directory"
 msgstr ""
 
-msgid "Determined {0} away"
+msgid "Vehicle"
 msgstr ""
 
-msgid "Reason"
+msgid "Restore defaults"
 msgstr ""
 
-msgid "This entry has been reported."
+msgid "Visualization"
 msgstr ""
 
-msgid "Server has rejected the request"
+msgid "Draw directions separately"
 msgstr ""
 
-msgid "Unable to connect to the server"
+msgid "Node color"
 msgstr ""
 
-msgid "Store Imagery Offset..."
+msgid "Arrow color"
 msgstr ""
 
-msgid ""
-"Upload an offset for current imagery (or calibration object geometry) to a "
-"server"
+msgid "Arrowhead fill color"
 msgstr ""
 
-msgid "Store calibration geometry"
+msgid "Arrowhead placement"
 msgstr ""
 
-msgid "Store imagery offset"
+msgid "New bookmark"
 msgstr ""
 
-msgid ""
-"The selected object can be used as a calibration geometry. What do you "
-"intend to do?"
+msgid "Really delete \"{0}\"?"
 msgstr ""
 
-msgid ""
-"The topmost imagery layer has no offset. Are you sure you want to upload "
-"this?"
+msgid "Bookmark deletion"
 msgstr ""
 
 msgid ""
-"You are registering an imagery offset. Other users in this area will be able "
-"to use it for mapping.\n"
-"Please make sure it is as precise as possible, and describe a region this "
-"offset is applicable to."
+"Really restore default bookmarks?\n"
+"All manually added or edited bookmarks will be lost!"
 msgstr ""
 
-msgid ""
-"You are registering a calibration geometry. It should be the most precisely "
-"positioned object, with\n"
-"clearly visible boundaries on various satellite imagery. Please describe "
-"this object and its whereabouts."
+msgid "Bookmark reset"
 msgstr ""
 
-msgid "Uploading a new offset..."
+msgid "Choose node color"
 msgstr ""
 
-msgid "This string should be 3 to 200 letters long."
+msgid "Choose arrow color"
 msgstr ""
 
-msgid "Adjust imagery"
+msgid "Choose arrowhead fill color"
 msgstr ""
 
-msgid "Adjust the position of the selected imagery layer"
+msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-msgid "Please select the imagery layer to adjust."
+msgid "GraphView layer is not mergable"
 msgstr ""
 
-msgid "Start adjusting"
+msgid "graphview default node"
 msgstr ""
 
-msgid "There are currently no imagery layer to adjust."
+msgid "graphview default segment"
 msgstr ""
 
-msgid "No layers to adjust"
+msgid "graphview arrowhead core"
 msgstr ""
 
-msgid "Normal"
-msgstr "一般"
-
-msgid "Rotate 90"
-msgstr "旋轉 90 度"
-
-msgid "Rotate 180"
-msgstr "旋轉 180 度"
-
-msgid "Rotate 270"
-msgstr "旋轉 270 度"
-
-msgid "Previous image"
-msgstr "上一幅圖片"
-
-msgid "Next image"
-msgstr "下一幅圖片"
-
-msgid "Rotate left"
-msgstr "向左旋轉"
-
-msgid "Rotate image left"
-msgstr "將圖片向左旋轉"
-
-msgid "Rotate right"
-msgstr "向右旋轉"
-
-msgid "Rotate image right"
-msgstr "將圖片向右旋轉"
-
-msgid "WayPoint Image"
-msgstr "航點圖片"
-
-msgid "Display non-geotagged photos"
-msgstr "顯示無 geotag 的相片"
-
-msgid "Imported Images"
-msgstr "匯入的圖片"
+msgid ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
+msgstr ""
 
-msgid "Import vector graphics"
-msgstr "匯入向量圖形"
+msgid ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
+msgstr ""
 
-msgid "Scale:"
-msgstr "縮放:"
+msgid ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
+msgstr ""
 
-msgid "unit(s) = "
-msgstr "單位 = "
+msgid ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
+msgstr ""
 
-msgid "Importing..."
-msgstr "正在匯入..."
+msgid "Tracktype grades must be given as integers between 0 and 5."
+msgstr ""
 
-msgid "SVG files [ImportVec plugin] (*.svg)"
+msgid ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
-msgid "Please open or create data layer before importing"
+msgid "Imagery XML Files"
 msgstr ""
 
-msgid "Concourse wizard ..."
+msgid "Save Imagery XML file"
 msgstr ""
 
-msgid "Opens up a wizard to create a concourse"
+msgid "XML Imagery Bounds"
 msgstr ""
 
-msgid "Vertical layer:"
+msgid "Generate Imagery XML bounds for the selection"
 msgstr ""
 
-msgid "Structure type:"
+msgid "edit bounds for selected defaults"
 msgstr ""
 
-msgid "Offset into background:"
+msgid "Download imagery XML bounds"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid ""
+"Validating error in file {0}:\n"
+"{1}\n"
+"Do you want to continue without validating the file ?"
 msgstr ""
 
-msgid "POWER"
+msgid "Open Imagery XML file"
 msgstr ""
 
-msgid "Activates the plug-in"
+msgid "Calibration Layer"
 msgstr ""
 
-msgid "Working Level"
+msgid "A deprecated calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Selects the working level."
+msgid "A calibration geometry of {0} nodes by {1}"
 msgstr ""
 
-msgid "Level Name"
+msgid "Change Color"
 msgstr ""
 
-msgid "Optional name-tag for a level."
+msgid "Deprecate Offset"
 msgstr ""
 
-msgid "The object preset you want to tag."
+msgid "Are you sure this imagery offset is wrong?"
 msgstr ""
 
-msgid "Sets the name tag when the room-object is selected."
+msgid "Are you sure this calibration geometry is aligned badly?"
 msgstr ""
 
-msgid "Sets the ref tag when the room-object is selected."
+msgid "Warning: deprecation is basically irreversible!"
 msgstr ""
 
-msgid "Apply Tags"
+msgid "To store imagery offsets you must be a registered OSM user."
 msgstr ""
 
-msgid "Fitting"
+msgid ""
+"Please enter the reason why you mark this imagery offset as deprecated"
 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>"
+"Please enter the reason why you mark this calibration geometry as deprecated"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Notifying the server of the deprecation..."
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Get Imagery Offset..."
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Download offsets for current imagery from a server"
 msgstr ""
 
-msgid "Highest Level"
+msgid ""
+"No data for this region. Please adjust imagery layer and upload an offset."
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Loading imagery offsets..."
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Error processing XML response: {0}"
 msgstr ""
 
-msgid "InfoMode"
+msgid "Offset"
 msgstr ""
 
-msgid "GPX info mode"
+msgid "Imagery Offset Database"
 msgstr ""
 
-msgid ""
-"Move the mouse to show trackpoint info for current layer. Hold shift to "
-"highlight tracks"
+msgid "mm"
 msgstr ""
 
-msgid "Delete this"
+msgid "cm"
 msgstr ""
 
-msgid "Delete this&older"
+msgid "km"
 msgstr ""
 
-msgid "km/h"
+msgid "Calibration geometries"
 msgstr ""
 
-msgid "Track name: "
+msgid "Deprecated offsets"
 msgstr ""
 
-msgid "Update IRS adjustment layer"
+msgid ""
+"The topmost imagery layer has been shifted to presumably match\n"
+"OSM data in the area. Please check that the offset is still valid\n"
+"by downloading GPS tracks and comparing them and OSM data to the imagery."
 msgstr ""
 
 msgid ""
-"This option creates IRS adjustment layer and a little way inside it. You "
-"need to adjust WMS layer placement first.\n"
-"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
-"with [irs rectify] in subject."
+"A layer has been added with a calibration geometry. Hide data layers,\n"
+"find the corresponding feature on the imagery layer and move it accordingly."
 msgstr ""
-"這個選項會建立含有許些路徑的 IRS 調整圖層。您需要先調整 WMS 圖層的放置。\n"
-"產生的圖層會儲存為 .osm 並以 [irs rectify] 為主旨寄給 Komzpa (me at komzpa.net)。"
-
-msgid "IRS Adjustment Layer"
-msgstr "IRS 調整圖層"
 
-msgid "Channel-Digraph created from the active OSM-Layer"
+msgid "Deprecated by {0} on {1}"
 msgstr ""
 
-msgid "Create Channel Digraph"
+msgid "Created by {0} on {1}"
 msgstr ""
 
-msgid "this layer is no osm data layer"
-msgstr "這個圖層沒有 osm 資料圖層"
-
-msgid "Converting OSM graph into Channel Digraph"
+msgid "Offset Information"
 msgstr ""
 
-msgid "filtering ways"
-msgstr "過濾路徑"
-
-msgid "creating Channel-Digraph"
+msgid "Report this offset"
 msgstr ""
 
-msgid "sealing Digraph"
+msgid "You are to notify moderators of this offset. Why?"
 msgstr ""
 
-msgid "calculating Strong Connectedness"
+msgid "Reporting the offset..."
 msgstr ""
 
-msgid "creating DigraphLayer"
+msgid "An imagery offset of {0}"
 msgstr ""
 
-msgid "JunctionChecking"
-msgstr "匯集點檢查"
-
-msgid "Open the junctionchecking window."
-msgstr "開啟匯集點檢查視窗。"
-
-msgid "junctions"
-msgstr "匯集點檢查"
-
-msgid "Channel-Digraph creation"
+msgid "Imagery ID"
 msgstr ""
 
-msgid "seal Channel Digraph"
+msgid "A calibration geometry of {0} nodes"
 msgstr ""
 
-msgid "calculate strong connected channels"
+msgid "Determined right here"
 msgstr ""
 
-msgid "Junctionchecking/junctions searching"
-msgstr "匯集點檢查/匯集點搜尋"
-
-msgid "order of junction (n):"
-msgstr "匯集點順序:"
-
-msgid "produce OSM-Relations: junction"
-msgstr "產生 OSM 關係:匯集點"
-
-msgid ""
-"if enabled the plugin produces osm-relations from the junction subgraphs"
-msgstr "如果啟用則外掛程式會從匯集點副圖表產生 osm 關係"
+msgid "Determined {0} away"
+msgstr ""
 
-msgid "create the channel digraph"
+msgid "Reason"
 msgstr ""
 
-msgid "Check "
-msgstr "檢查 "
+msgid "This entry has been reported."
+msgstr ""
 
-msgid "check the subset for junction properties"
+msgid "Server has rejected the request"
 msgstr ""
 
-msgid "Search "
-msgstr "搜尋 "
+msgid "Unable to connect to the server"
+msgstr ""
 
-msgid "search for junctions in the channel subset"
-msgstr "在頻道子集中搜尋交流"
+msgid "Store Imagery Offset..."
+msgstr ""
 
 msgid ""
-"The marked channels contains a junctioncandidate (white). To test this "
-"candidat mark these channel and press the \"Check\" button again."
+"Upload an offset for current imagery (or calibration object geometry) to a "
+"server"
 msgstr ""
 
-msgid "The marked channels are a {0}-ways junction"
+msgid "Store calibration geometry"
 msgstr ""
 
-msgid "The marked channels are not a junction:"
+msgid "Store imagery offset"
 msgstr ""
 
-msgid "construct channel digraph and search for junctions"
+msgid ""
+"The selected object can be used as a calibration geometry. What do you "
+"intend to do?"
 msgstr ""
 
-msgid "Number of {0}-ways junctions found: {1}"
+msgid ""
+"The topmost imagery layer has no offset. Are you sure you want to upload "
+"this?"
 msgstr ""
 
-msgid "generate all combinations from entrie/exit candidates"
+msgid ""
+"You are registering an imagery offset. Other users in this area will be able "
+"to use it for mapping.\n"
+"Please make sure it is as precise as possible, and describe a region this "
+"offset is applicable to."
 msgstr ""
 
-msgid "Direction index ''{0}'' not found"
-msgstr "找不到方向索引「{0}」"
-
-msgid "The starting location was not within the bbox"
-msgstr "開始的位置不在 bbox 內"
-
-msgid "Looking for shoreline..."
-msgstr "尋找海岸線..."
-
-msgid "{0} nodes so far..."
-msgstr "目前 {0} 個節點..."
-
-msgid "Lake Walker."
-msgstr "Lake Walker。"
-
-msgid "Lake Walker"
-msgstr "Lake Walker"
-
-msgid "Error creating cache directory: {0}"
-msgstr "建立快取目錄時發生錯誤:{0}"
-
-msgid "Tracing"
-msgstr "正在追蹤"
-
-msgid "checking cache..."
-msgstr "正在檢查快取..."
-
-msgid "Running vertex reduction..."
-msgstr "正在執行端點縮減..."
-
-msgid "Running Douglas-Peucker approximation..."
-msgstr "執行近似 Douglas-Peucker..."
-
-msgid "Removing duplicate nodes..."
-msgstr "正在移除重複的節點..."
-
-msgid "Lakewalker trace"
-msgstr "Lakewalker 軌跡"
-
-msgid "An unknown error has occurred"
-msgstr "發生不明的錯誤"
-
-msgid "east"
-msgstr "東"
-
-msgid "northeast"
-msgstr "東北"
-
-msgid "north"
-msgstr "北"
-
-msgid "northwest"
-msgstr "西北"
-
-msgid "west"
-msgstr "西"
-
-msgid "southwest"
-msgstr "西南"
-
-msgid "south"
-msgstr "南"
-
-msgid "southeast"
-msgstr "東南"
-
-msgid "coastline"
-msgstr "海岸線"
-
-msgid "land"
-msgstr "陸地"
-
-msgid "Maximum number of segments per way"
-msgstr "每路徑的最大區段數"
-
-msgid "Maximum number of nodes in initial trace"
-msgstr "初始化軌跡的最大節點數"
-
-msgid "Maximum gray value to count as water (0-255)"
-msgstr "判斷為水域的最大灰色值 (0-255)"
-
-msgid "Line simplification accuracy (degrees)"
-msgstr "線條簡化準確度(度)"
+msgid ""
+"You are registering a calibration geometry. It should be the most precisely "
+"positioned object, with\n"
+"clearly visible boundaries on various satellite imagery. Please describe "
+"this object and its whereabouts."
+msgstr ""
 
-msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr "Landsat 拼貼的解析度(每一度的像素)"
+msgid "Uploading a new offset..."
+msgstr ""
 
-msgid "Size of Landsat tiles (pixels)"
-msgstr "Landsat 拼貼的大小(像素)"
+msgid "This string should be 3 to 200 letters long."
+msgstr ""
 
-msgid "Shift all traces to east (degrees)"
-msgstr "所有軌跡向東平移(度)"
+msgid "Adjust imagery"
+msgstr ""
 
-msgid "Shift all traces to north (degrees)"
-msgstr "所有軌跡向北平移(度)"
+msgid "Adjust the position of the selected imagery layer"
+msgstr ""
 
-msgid "Direction to search for land"
-msgstr "搜尋陸地的方向"
+msgid "Please select the imagery layer to adjust."
+msgstr ""
 
-msgid "Tag ways as"
-msgstr "將路徑標記為"
+msgid "Start adjusting"
+msgstr ""
 
-msgid "WMS Layer"
-msgstr "WMS 圖層"
+msgid "There are currently no imagery layer to adjust."
+msgstr ""
 
-msgid "Maximum cache size (MB)"
-msgstr "最大快取大小 (MB)"
+msgid "No layers to adjust"
+msgstr ""
 
-msgid "Maximum cache age (days)"
-msgstr "最大快取留存時間(天)"
+msgid "Normal"
+msgstr "一般"
 
-msgid "Source text"
-msgstr "來源文字"
+msgid "Rotate 90"
+msgstr "旋轉 90 度"
 
-msgid "Lakewalker Plugin Preferences"
-msgstr "Lakewalker 外掛程式偏好設定"
+msgid "Rotate 180"
+msgstr "旋轉 180 度"
 
-msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "用來追蹤 Landsat 圖庫中水域的外掛程式。"
+msgid "Rotate 270"
+msgstr "旋轉 270 度"
 
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
-msgstr "在每個產生的路徑中允許的最大區段數。預設為 250。"
+msgid "Previous image"
+msgstr "上一幅圖片"
 
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
-msgstr "在簡化線條前產生最大的節點數目。預設值為 50000。"
+msgid "Next image"
+msgstr "下一幅圖片"
 
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
-msgstr "被認定為水域的最大灰色數值(基於 Landsat IR-1 資料。可以是範圍 0-255。預設值為 90。"
+msgid "Rotate left"
+msgstr "向左旋轉"
 
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
-msgstr ""
-"Douglas-Peucker 線條簡化的準確度,以度為測量單位。<br>較低的數值會產生較多的節點,和更準確的線條。預設值為 0.0003。"
+msgid "Rotate image left"
+msgstr "將圖片向左旋轉"
 
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
-msgstr "Landsat 拼貼的解析度,以每一度像素為測量單位。預設值為 4000。"
+msgid "Rotate right"
+msgstr "向右旋轉"
 
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr "一個 landsat 拼貼的大小,以像素為測量單位。預設值為 2000。"
+msgid "Rotate image right"
+msgstr "將圖片向右旋轉"
 
-msgid "Offset all points in East direction (degrees). Default 0."
-msgstr "所有點向東方移位(度)。預設值為 0。"
+msgid "WayPoint Image"
+msgstr "航點圖片"
 
-msgid "Offset all points in North direction (degrees). Default 0."
-msgstr "所有點向北方移位(度)。預設值為 0。"
+msgid "Display non-geotagged photos"
+msgstr "顯示無 geotag 的相片"
 
-msgid "Direction to search for land. Default east."
-msgstr "搜尋陸地方向。預設值為東方。"
+msgid "Imported Images"
+msgstr "匯入的圖片"
 
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr "將路徑加上標籤成為水域、海岸線、陸地或都不是。預設值為水域。"
+msgid "Import vector graphics"
+msgstr "匯入向量圖形"
 
-msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr "再次追蹤時要使用的 WMS 圖層。預設值為 IR1。"
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
 
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr "每個快取目錄的最大容量(位元組)。預設值為 300MB"
+msgid "Concourse wizard ..."
+msgstr ""
 
-msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "每個快取檔案留存的最大天數。預設值為 100"
+msgid "Opens up a wizard to create a concourse"
+msgstr ""
 
-msgid "Data source text. Default is Landsat."
-msgstr "資料來源文字。預設值為 Landsat。"
+msgid "Vertical layer:"
+msgstr ""
 
-msgid "Downloading image tile..."
-msgstr "正在下載圖片拼貼..."
+msgid "Structure type:"
+msgstr ""
 
-msgid "Could not acquire image"
-msgstr "無法擷取圖片"
+msgid "Offset into background:"
+msgstr ""
 
-msgid "Connection Failed"
-msgstr "連線失敗"
+msgid "Indoor Mapping Helper"
+msgstr ""
 
-msgid "Not connected"
-msgstr "未連線"
+msgid "POWER"
+msgstr ""
 
-msgid "Connecting"
-msgstr "正在連線"
+msgid "Activates the plug-in"
+msgstr ""
 
-msgid "Connected"
-msgstr "已連線"
+msgid "Working Level"
+msgstr ""
 
-msgid "no name"
-msgstr "沒有名稱"
+msgid "Selects the working level."
+msgstr ""
 
-msgid "Live GPS"
-msgstr "Live GPS"
+msgid "Level Name"
+msgstr ""
 
-msgid "Show GPS data."
-msgstr "顯示 GPS 資料。"
+msgid "Optional name-tag for a level."
+msgstr ""
 
-msgid "Status"
-msgstr "狀態"
+msgid "The object preset you want to tag."
+msgstr ""
 
-msgid "Way Info"
-msgstr "路徑資訊"
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
 
-msgid "Speed"
-msgstr "速度"
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
 
-msgid "Course"
-msgstr "道路"
+msgid "Apply Tags"
+msgstr ""
 
-msgid "LiveGPS layer"
-msgstr "LiveGPS 圖層"
+msgid "Fitting"
+msgstr ""
 
-msgid "Capture GPS Track"
-msgstr "擷取 GPS 軌跡"
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
 
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr "連線至 gpsd 伺服器並在 LiveGPS 圖層中顯示目前的位置。"
+msgid "Level Selection"
+msgstr ""
 
-msgid "Center Once"
-msgstr "置中一次"
+msgid "Lowest Level"
+msgstr ""
 
-msgid "Center the LiveGPS layer to current position."
-msgstr "將 LiveGPS 圖層置中於目前的位置。"
+msgid "The lowest level of your building."
+msgstr ""
 
-msgid "Auto-Center"
-msgstr "自動置中"
+msgid "Highest Level"
+msgstr ""
 
-msgid "Continuously center the LiveGPS layer to current position."
-msgstr "持續將 LiveGPS 圖層置中到目前的位置。"
+msgid "The highest level of your building."
+msgstr ""
 
-msgid "Open MapDust"
-msgstr "開啟 MapDust"
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
 
-msgid "MapDust bug reports"
+msgid "InfoMode"
 msgstr ""
 
-msgid "Activates the MapDust bug reporter plugin"
+msgid "GPX info mode"
 msgstr ""
 
-msgid "Missing input data"
-msgstr "缺少輸入資料"
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
 
-msgid "Mapillary Images"
+msgid "Delete this"
 msgstr ""
 
-msgid "Mapillary layer"
+msgid "Delete this&older"
 msgstr ""
 
-msgid "Total images:"
+msgid "km/h"
 msgstr ""
 
-msgid "images"
+msgid "Track name: "
 msgstr ""
 
-msgid "Traffic sign font at ''{0}'' has wrong format"
+msgid "Update IRS adjustment layer"
 msgstr ""
 
-msgid "Could not read font-file from ''{0}''"
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
 msgstr ""
+"這個選項會建立含有許些路徑的 IRS 調整圖層。您需要先調整 WMS 圖層的放置。\n"
+"產生的圖層會儲存為 .osm 並以 [irs rectify] 為主旨寄給 Komzpa (me at komzpa.net)。"
 
-msgid "Mapillary"
+msgid "IRS Adjustment Layer"
+msgstr "IRS 調整圖層"
+
+msgid "Channel-Digraph created from the active OSM-Layer"
 msgstr ""
 
-msgid "Create Mapillary layer"
+msgid "Create Channel Digraph"
 msgstr ""
 
-msgid "Start Mapillary layer"
+msgid "this layer is no osm data layer"
+msgstr "這個圖層沒有 osm 資料圖層"
+
+msgid "Converting OSM graph into Channel Digraph"
 msgstr ""
 
-msgid "Download Mapillary images in current view"
+msgid "filtering ways"
+msgstr "過濾路徑"
+
+msgid "creating Channel-Digraph"
 msgstr ""
 
-msgid "Export pictures"
+msgid "sealing Digraph"
 msgstr ""
 
-msgid "Export Mapillary pictures"
+msgid "calculating Strong Connectedness"
 msgstr ""
 
-msgid "Export images"
+msgid "creating DigraphLayer"
 msgstr ""
 
-msgid "Import pictures"
-msgstr ""
+msgid "JunctionChecking"
+msgstr "匯集點檢查"
+
+msgid "Open the junctionchecking window."
+msgstr "開啟匯集點檢查視窗。"
 
-msgid "Import local pictures"
-msgstr ""
+msgid "junctions"
+msgstr "匯集點檢查"
 
-msgid "Import pictures into Mapillary layer"
+msgid "Channel-Digraph creation"
 msgstr ""
 
-msgid "Select pictures"
+msgid "seal Channel Digraph"
 msgstr ""
 
-msgid "Import pictures into sequence"
+msgid "calculate strong connected channels"
 msgstr ""
 
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
+msgid "Junctionchecking/junctions searching"
+msgstr "匯集點檢查/匯集點搜尋"
 
-msgid "Join mode"
-msgstr ""
+msgid "order of junction (n):"
+msgstr "匯集點順序:"
 
-msgid "Join/unjoin pictures"
-msgstr ""
+msgid "produce OSM-Relations: junction"
+msgstr "產生 OSM 關係:匯集點"
 
-msgid "Join Mapillary pictures"
-msgstr ""
+msgid ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
+msgstr "如果啟用則外掛程式會從匯集點副圖表產生 osm 關係"
 
-msgid "Submit changeset"
+msgid "create the channel digraph"
 msgstr ""
 
-msgid "Submit the current changeset"
-msgstr ""
+msgid "Check "
+msgstr "檢查 "
 
-msgid "Submit the current changeset to Mapillary"
+msgid "check the subset for junction properties"
 msgstr ""
 
-msgid "Upload pictures"
-msgstr ""
+msgid "Search "
+msgstr "搜尋 "
 
-msgid "Upload Mapillary pictures"
-msgstr ""
+msgid "search for junctions in the channel subset"
+msgstr "在頻道子集中搜尋交流"
 
-msgid "Upload pictures."
+msgid ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidat mark these channel and press the \"Check\" button again."
 msgstr ""
 
-msgid "Walk mode"
+msgid "The marked channels are a {0}-ways junction"
 msgstr ""
 
-msgid "Start walk mode"
+msgid "The marked channels are not a junction:"
 msgstr ""
 
-msgid "Zoom to selected image"
+msgid "construct channel digraph and search for junctions"
 msgstr ""
 
-msgid "Zoom to the currently selected Mapillary image"
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
-msgid "Uploaded {0} images"
+msgid "generate all combinations from entrie/exit candidates"
 msgstr ""
 
-msgid "Approve upload on the website"
+msgid "Check the direction"
 msgstr ""
 
-msgid "View in website"
+msgid ""
+"Check the direction of the selected stream/river. Is it correct?\n"
+" Progress: "
 msgstr ""
 
-msgid "Copy key"
+msgid "Correct"
 msgstr ""
 
-msgid "Copy key tag"
+msgid "Wrong"
 msgstr ""
 
-msgid "Edit on website"
+msgid "<HTML><U>C</U>orrect direction</HTML>"
 msgstr ""
 
-msgid "Current Mapillary changeset"
+msgid "Direction of river is correct."
 msgstr ""
 
-msgid "Open Mapillary changeset dialog"
+msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
-msgid "Mapillary changeset"
+msgid "Direction of river is wrong."
 msgstr ""
 
-msgid "Submit"
+msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
 
-msgid "Export all images"
+msgid "Ignore direction of this way."
 msgstr ""
 
-msgid "Export selected sequence"
+msgid "Check direction of streams"
 msgstr ""
 
-msgid "Export selected images"
+msgid "Check direction of streams and rivers"
 msgstr ""
 
-msgid "Rewrite imported images"
+msgid "No more directions to check!"
 msgstr ""
 
-msgid "Select a folder"
+msgid "Replace way"
 msgstr ""
 
-msgid "Explore"
+msgid "Replace way of selected way with a new way"
 msgstr ""
 
-msgid "Select a directory"
+msgid "Replace Geometry"
 msgstr ""
 
-msgid "Speed limit"
+msgid ""
+"This tool replaces coastline of one way with another, and so requires "
+"exactly two coatline ways to be selected."
 msgstr ""
 
-msgid "Give way"
-msgstr ""
+msgid "Direction index ''{0}'' not found"
+msgstr "找不到方向索引「{0}」"
 
-msgid "No entry"
-msgstr ""
+msgid "The starting location was not within the bbox"
+msgstr "開始的位置不在 bbox 內"
 
-msgid "Intersection danger"
-msgstr ""
+msgid "Looking for shoreline..."
+msgstr "尋找海岸線..."
 
-msgid "Mandatory direction (any)"
-msgstr ""
+msgid "{0} nodes so far..."
+msgstr "目前 {0} 個節點..."
 
-msgid "Uneven road"
-msgstr ""
+msgid "Lake Walker."
+msgstr "Lake Walker。"
 
-msgid "No parking"
-msgstr ""
+msgid "Lake Walker"
+msgstr "Lake Walker"
 
-msgid "No overtaking"
-msgstr ""
+msgid "Error creating cache directory: {0}"
+msgstr "建立快取目錄時發生錯誤:{0}"
 
-msgid "Pedestrian crossing"
-msgstr ""
+msgid "Tracing"
+msgstr "正在追蹤"
 
-msgid "No turn"
-msgstr ""
+msgid "checking cache..."
+msgstr "正在檢查快取..."
 
-msgid "Years"
-msgstr ""
+msgid "Running vertex reduction..."
+msgstr "正在執行端點縮減..."
 
-msgid "Months"
-msgstr ""
+msgid "Running Douglas-Peucker approximation..."
+msgstr "執行近似 Douglas-Peucker..."
 
-msgid "Days"
-msgstr ""
+msgid "Removing duplicate nodes..."
+msgstr "正在移除重複的節點..."
 
-msgid "Imported images"
-msgstr ""
+msgid "Lakewalker trace"
+msgstr "Lakewalker 軌跡"
 
-msgid "Mapillary filter"
-msgstr ""
+msgid "An unknown error has occurred"
+msgstr "發生不明的錯誤"
 
-msgid "Open Mapillary filter dialog"
-msgstr ""
+msgid "east"
+msgstr "東"
 
-msgid "Not older than: "
-msgstr ""
+msgid "northeast"
+msgstr "東北"
 
-msgid "Downloaded images"
-msgstr ""
+msgid "north"
+msgstr "北"
 
-msgid "Only images with signs"
-msgstr ""
+msgid "northwest"
+msgstr "西北"
 
-msgid "Choose signs"
-msgstr ""
+msgid "west"
+msgstr "西"
 
-msgid "Mapillary history"
-msgstr ""
+msgid "southwest"
+msgstr "西南"
 
-msgid "Open Mapillary history dialog"
-msgstr ""
+msgid "south"
+msgstr "南"
 
-msgid "Mapillary picture"
-msgstr ""
+msgid "southeast"
+msgstr "東南"
 
-msgid "Open Mapillary window"
-msgstr ""
+msgid "coastline"
+msgstr "海岸線"
 
-msgid "Mapillary dialog"
-msgstr ""
+msgid "land"
+msgstr "陸地"
 
-msgid "Open Mapillary main dialog"
-msgstr ""
+msgid "Maximum number of segments per way"
+msgstr "每路徑的最大區段數"
 
-msgid "Next picture"
-msgstr ""
+msgid "Maximum number of nodes in initial trace"
+msgstr "初始化軌跡的最大節點數"
 
-msgid "Shows the next picture in the sequence"
-msgstr ""
+msgid "Maximum gray value to count as water (0-255)"
+msgstr "判斷為水域的最大灰色值 (0-255)"
 
-msgid "Previous picture"
-msgstr ""
+msgid "Line simplification accuracy (degrees)"
+msgstr "線條簡化準確度(度)"
 
-msgid "Shows the previous picture in the sequence"
-msgstr ""
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr "Landsat 拼貼的解析度(每一度的像素)"
 
-msgid "Jump to red"
-msgstr ""
+msgid "Size of Landsat tiles (pixels)"
+msgstr "Landsat 拼貼的大小(像素)"
 
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
+msgid "Shift all traces to east (degrees)"
+msgstr "所有軌跡向東平移(度)"
 
-msgid "Jump to blue"
-msgstr ""
+msgid "Shift all traces to north (degrees)"
+msgstr "所有軌跡向北平移(度)"
 
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
+msgid "Direction to search for land"
+msgstr "搜尋陸地的方向"
 
-msgid "Stops the walk."
-msgstr ""
+msgid "Tag ways as"
+msgstr "將路徑標記為"
 
-msgid "Play"
-msgstr ""
+msgid "WMS Layer"
+msgstr "WMS 圖層"
 
-msgid "Continues with the paused walk."
-msgstr ""
+msgid "Maximum cache size (MB)"
+msgstr "最大快取大小 (MB)"
 
-msgid "Pause"
-msgstr ""
+msgid "Maximum cache age (days)"
+msgstr "最大快取留存時間(天)"
 
-msgid "Pauses the walk."
-msgstr ""
+msgid "Source text"
+msgstr "來源文字"
 
-msgid "Display hour when the picture was taken"
-msgstr ""
+msgid "Lakewalker Plugin Preferences"
+msgstr "Lakewalker 外掛程式偏好設定"
 
-msgid "Use 24 hour format"
-msgstr ""
+msgid "A plugin to trace water bodies on Landsat imagery."
+msgstr "用來追蹤 Landsat 圖庫中水域的外掛程式。"
 
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
+msgstr "在每個產生的路徑中允許的最大區段數。預設為 250。"
 
-msgid "Preview images when hovering its icon"
-msgstr ""
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
+msgstr "在簡化線條前產生最大的節點數目。預設值為 50000。"
 
-msgid "Download mode"
-msgstr ""
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
+msgstr "被認定為水域的最大灰色數值(基於 Landsat IR-1 資料。可以是範圍 0-255。預設值為 90。"
 
-msgid "You are logged in as ''{0}''."
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
+"Douglas-Peucker 線條簡化的準確度,以度為測量單位。<br>較低的數值會產生較多的節點,和更準確的線條。預設值為 0.0003。"
 
-msgid "You are currently not logged in."
-msgstr ""
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgstr "Landsat 拼貼的解析度,以每一度像素為測量單位。預設值為 4000。"
 
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgstr "一個 landsat 拼貼的大小,以像素為測量單位。預設值為 2000。"
 
-msgid "Upload selected sequence"
-msgstr ""
+msgid "Offset all points in East direction (degrees). Default 0."
+msgstr "所有點向東方移位(度)。預設值為 0。"
 
-msgid "Delete after upload"
-msgstr ""
+msgid "Offset all points in North direction (degrees). Default 0."
+msgstr "所有點向北方移位(度)。預設值為 0。"
 
-msgid "Wait for full quality pictures"
-msgstr ""
+msgid "Direction to search for land. Default east."
+msgstr "搜尋陸地方向。預設值為東方。"
 
-msgid "Follow selected image"
-msgstr ""
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgstr "將路徑加上標籤成為水域、海岸線、陸地或都不是。預設值為水域。"
 
-msgid "Go forward"
-msgstr ""
+msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgstr "再次追蹤時要使用的 WMS 圖層。預設值為 IR1。"
 
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr "每個快取目錄的最大容量(位元組)。預設值為 300MB"
 
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr "每個快取檔案留存的最大天數。預設值為 100"
 
-msgid "2 images joined"
-msgstr ""
+msgid "Data source text. Default is Landsat."
+msgstr "資料來源文字。預設值為 Landsat。"
 
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Downloading image tile..."
+msgstr "正在下載圖片拼貼..."
 
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not acquire image"
+msgstr "無法擷取圖片"
 
-msgid "2 images unjoined"
-msgstr ""
+msgid "Connection Failed"
+msgstr "連線失敗"
 
-msgid "everything in the visible area"
-msgstr ""
+msgid "Not connected"
+msgstr "未連線"
 
-msgid "areas with downloaded OSM-data"
-msgstr ""
+msgid "Connecting"
+msgstr "正在連線"
 
-msgid "only when manually requested"
-msgstr ""
+msgid "Connected"
+msgstr "已連線"
 
-msgid ""
-"The downloaded OSM area is too big. Download mode has been changed to "
-"semiautomatic until the layer is restarted."
-msgstr ""
+msgid "no name"
+msgstr "沒有名稱"
 
-msgid "Downloading"
-msgstr ""
+msgid "Live GPS"
+msgstr "Live GPS"
 
-msgid "Select mode"
-msgstr ""
+msgid "Show GPS data."
+msgstr "顯示 GPS 資料。"
 
-msgid "Mapillary login"
-msgstr ""
+msgid "Status"
+msgstr "狀態"
 
-msgid "Login successful, return to JOSM."
-msgstr ""
+msgid "Way Info"
+msgstr "路徑資訊"
 
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
+msgid "Speed"
+msgstr "速度"
 
-msgid "Downloading Mapillary images"
-msgstr ""
+msgid "Course"
+msgstr "道路"
 
-msgid "Total Mapillary images: {0}"
-msgstr ""
+msgid "LiveGPS layer"
+msgstr "LiveGPS 圖層"
 
-msgid "Submitting Mapillary Changeset"
-msgstr ""
+msgid "Capture GPS Track"
+msgstr "擷取 GPS 軌跡"
 
-msgid "No images found"
-msgstr ""
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr "連線至 gpsd 伺服器並在 LiveGPS 圖層中顯示目前的位置。"
 
-msgid "Finished upload"
-msgstr ""
+msgid "Center Once"
+msgstr "置中一次"
 
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
+msgid "Center the LiveGPS layer to current position."
+msgstr "將 LiveGPS 圖層置中於目前的位置。"
 
-msgid "Not Logged in to Mapillary"
-msgstr ""
+msgid "Auto-Center"
+msgstr "自動置中"
 
-msgid "Uploading: {0}"
-msgstr ""
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr "持續將 LiveGPS 圖層置中到目前的位置。"
 
-msgid "The image key ''{0}'' is invalid!"
-msgstr ""
+msgid "Open MapDust"
+msgstr "開啟 MapDust"
 
-msgid "The image key must not be null here!"
+msgid "MapDust bug reports"
 msgstr ""
 
-msgid "The sequence key ''{0}'' is invalid!"
+msgid "Activates the MapDust bug reporter plugin"
 msgstr ""
 
-msgid "The sequence key must not be null here!"
-msgstr ""
+msgid "Missing input data"
+msgstr "缺少輸入資料"
 
 msgid "Measured values"
 msgstr "測量的數值"
@@ -29758,6 +29893,9 @@ msgstr ""
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
 
+msgid "moved"
+msgstr ""
+
 msgid "rail"
 msgstr "軌"
 
@@ -29853,9 +29991,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-msgid "moved"
-msgstr ""
-
 msgid "Public Transport: Join GTFS stops"
 msgstr ""
 
@@ -30867,6 +31002,66 @@ msgstr "請選擇單一、封閉、最少四個節點的路徑。(或者您可
 msgid "Terrace"
 msgstr "連棟建築"
 
+msgid "Pass over element without marking it"
+msgstr ""
+
+msgid "Mark element done"
+msgstr ""
+
+msgid "Todo list"
+msgstr ""
+
+msgid "Open the todo list."
+msgstr ""
+
+msgid "Zoom to the selected item in the todo list."
+msgstr ""
+
+msgid "Select all Unmarked and Zoom"
+msgstr ""
+
+msgid "Select and zoom to all of the unmarked items in the todo list."
+msgstr ""
+
+msgid "Pass"
+msgstr ""
+
+msgid "Moves on to the next item but leaves this item in the todo list. ([)."
+msgstr ""
+
+msgid "Add the selected items to the todo list."
+msgstr ""
+
+msgid "Mark selected"
+msgstr ""
+
+msgid "Mark the selected items (on the map) as done in the todo list."
+msgstr ""
+
+msgid "Mark the selected item in the todo list as done. (])."
+msgstr ""
+
+msgid "Mark all"
+msgstr ""
+
+msgid "Mark all items in the todo list as done."
+msgstr ""
+
+msgid "Unmark all"
+msgstr ""
+
+msgid "Unmark all items in the todo list that have been marked as done."
+msgstr ""
+
+msgid "Clear the todo list"
+msgstr ""
+
+msgid "Remove all items (marked and unmarked) from the todo list."
+msgstr ""
+
+msgid "Todo list {0}/{1} ({2}%)"
+msgstr ""
+
 msgid "To-fix"
 msgstr ""
 
@@ -31324,6 +31519,84 @@ msgstr "選擇金鑰的到期日:"
 msgid "Create a new signing key"
 msgstr "建立新的簽署金鑰"
 
+msgid "Turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn lanes tagging - Editor"
+msgstr ""
+
+msgid "turn lanes tagging - editor"
+msgstr ""
+
+msgid "Turn Lanes Editor"
+msgstr ""
+
+msgid " The number of lanes has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:forward has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:both_ways has fixed according number of turns"
+msgstr ""
+
+msgid " The number of lanes:backward has fixed according number of turns"
+msgstr ""
+
+msgid "check the right direction of the way"
+msgstr ""
+
+msgid "Unidirectional road"
+msgstr ""
+
+msgid "Build unidirectional road"
+msgstr ""
+
+msgid "Bidirectional road"
+msgstr ""
+
+msgid "Build bidirectional road"
+msgstr ""
+
+msgid "Use \"none\""
+msgstr ""
+
+msgid "use \"none\" instead of empty values"
+msgstr ""
+
+msgid "Preset turn lanes"
+msgstr ""
+
+msgid "Recently turn lanes edits"
+msgstr ""
+
+msgid "Forward"
+msgstr "快轉"
+
+msgid "Both way lane"
+msgstr ""
+
+msgid "Backward"
+msgstr "向後"
+
+msgid "Number of backward lanes"
+msgstr ""
+
+msgid "Number of forward lanes"
+msgstr ""
+
+msgid "Both way"
+msgstr ""
+
+msgid "Number of lanes"
+msgstr ""
+
+msgid "Directional"
+msgstr ""
+
+msgid "Turn lanes"
+msgstr ""
+
 msgid "No such lane."
 msgstr ""
 
@@ -32153,9 +32426,6 @@ msgstr ""
 msgid "Multitag Background: highlight"
 msgstr ""
 
-msgid "Replace Geometry"
-msgstr ""
-
 msgid "Replace geometry of selected object with a new one"
 msgstr ""
 
@@ -32349,15 +32619,9 @@ msgstr "開始/暫停影片的播放"
 msgid "Video: {0}"
 msgstr ""
 
-msgid "Backward"
-msgstr "向後"
-
 msgid "jumps n sec back"
 msgstr "向後 n 秒"
 
-msgid "Forward"
-msgstr "快轉"
-
 msgid "jumps n sec forward"
 msgstr "向前 n 秒"
 
diff --git a/images/presets/landuse/scree.svg b/images/presets/landuse/scree.svg
new file mode 100644
index 0000000..b6b9e69
--- /dev/null
+++ b/images/presets/landuse/scree.svg
@@ -0,0 +1,156 @@
+<?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"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="scree.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627416"
+     inkscape:cx="4.0410436"
+     inkscape:cy="8.5866762"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </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 />
+        <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="rect4198"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3622"
+       ry="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4138"
+       d="m 10.258019,1045.507 -4.9315088,3.2084 1.1592131,-3.6528 3.7722957,0.4444"
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.38913,1051.5151 -1.6273,-4.4851 2.682687,1.2663 -1.055387,3.2188"
+       id="path4140"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.8799812,1048.3717 0.7234787,3.3481 2.7905591,-0.8681 -0.723478,-3.3481 z"
+       id="path4144"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.68507307,1046.6156 1.29312333,3.0912 2.5765242,-1.5513 -1.2931235,-3.0913 z"
+       id="path4154"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12.151955,1044.811 1.764384,2.7354 2.279824,-2.1169 -1.764384,-2.7355 z"
+       id="path4156"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4168"
+       d="m 12.167974,1039.7264 -0.433942,-3.4195 -2.8499825,0.5208 0.4339416,3.4194 z"
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.8794189,1037.542 -3.38935,2.7184 0.5617244,-3.3923 2.8276256,0.6739"
+       id="path4176"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.1519701,1044.0256 -1.0150809,-1.9343 -1.62893939,1.199 1.01508099,1.9345 z"
+       id="path4182"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.2099268,1038.5399 1.5103828,-2.0853 1.5463443,1.415 0.8630758,1.8618 -1.5823057,0.7448 -2.5892277,-0.6703 z"
+       id="path4186"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4188"
+       d="m 8.44135,1042.7781 1.5103828,-2.0854 1.5463452,1.4151 0.863076,1.8618 -1.582307,0.7448 -2.5892275,-0.6703 z"
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.511734,1038.1263 2.442605,0.6306 -0.658346,2.0252 -1.321377,1.5469 -1.27758,-1.2203 -0.409721,-2.7307 z"
+       id="path4190"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4192"
+       d="m 2.0027142,1050.0028 1.3342328,0.2769 -0.3596109,0.8893 -0.7217805,0.6791 -0.6978566,-0.5357 -0.2238036,-1.199 z"
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4194"
+       d="m 6.7094966,1042.5684 0.5318053,1.615 -1.2558384,0.3635 -1.2444886,-0.1866 0.1731104,-1.1688 1.2410475,-1.226 z"
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.1784704,1049.3513 0.8442001,2.4558 -1.9935469,0.5527 -1.9755301,-0.2839 0.2747995,-1.777 1.9700675,-1.8643 z"
+       id="path4196"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.8181901,1041.8885 -1.3415512,1.0446 -0.7652115,-1.0601 -0.2434248,-1.2346 1.1588218,-0.2306 1.5723445,0.7556 z"
+       id="path4200"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/images/presets/landuse/shingle.svg b/images/presets/landuse/shingle.svg
new file mode 100644
index 0000000..9271359
--- /dev/null
+++ b/images/presets/landuse/shingle.svg
@@ -0,0 +1,158 @@
+<?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"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="shingle6.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-0.40044535"
+     inkscape:cy="8.404631"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="rect4198"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3622"
+       ry="0" />
+    <ellipse
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="path4202"
+       cx="2.375"
+       cy="1038.0497"
+       rx="1.65625"
+       ry="1.0625" />
+    <ellipse
+       cy="1041.1122"
+       cx="2.21875"
+       id="circle4204"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       rx="1.71875"
+       ry="1.125" />
+    <ellipse
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="circle4206"
+       cx="2.6875"
+       cy="1046.2528"
+       rx="1.78125"
+       ry="1.171875" />
+    <ellipse
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="circle4210"
+       cx="6.4524856"
+       cy="1039.6826"
+       rx="1.8125"
+       ry="1.0828362" />
+    <ellipse
+       cy="1050.0265"
+       cx="4.390625"
+       id="circle4212"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       rx="2.484375"
+       ry="1.6361833" />
+    <ellipse
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="circle4214"
+       cx="9.1875"
+       cy="1048.4403"
+       rx="1.8125"
+       ry="1.078125" />
+    <ellipse
+       cy="1050.0184"
+       cx="13.515625"
+       id="circle4216"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       rx="1.984375"
+       ry="1.34375" />
+    <ellipse
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="circle4218"
+       cx="7.5336056"
+       cy="1043.3622"
+       rx="3.4663944"
+       ry="2" />
+    <ellipse
+       cy="1046.0211"
+       cx="12.970321"
+       id="circle4220"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       rx="1.8421797"
+       ry="1.3410692" />
+    <ellipse
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="circle4222"
+       cx="13.624675"
+       cy="1041.9883"
+       rx="2.1565752"
+       ry="1.5636104" />
+    <ellipse
+       cy="1039.0265"
+       cx="10.9375"
+       id="circle4212-0"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       rx="2.03125"
+       ry="1.4174333" />
+  </g>
+</svg>
diff --git a/images/presets/transport/airport/holding_position.svg b/images/presets/transport/airport/holding_position.svg
new file mode 100644
index 0000000..47d5830
--- /dev/null
+++ b/images/presets/transport/airport/holding_position.svg
@@ -0,0 +1,115 @@
+<?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"
+   width="16"
+   height="9"
+   viewBox="0 0 16 9"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="holding_position2.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="-7.7991071"
+     inkscape:cy="5.9288924"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4147"
+       originx="0"
+       originy="-2.9999632" />
+  </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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1040.3623)">
+    <rect
+       style="opacity:1;fill:#999999;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4179"
+       width="16"
+       height="9.0000715"
+       x="0"
+       y="1040.3622"
+       ry="0" />
+    <rect
+       style="opacity:1;fill:#ffde00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4187"
+       width="16"
+       height="1.0000806"
+       x="0"
+       y="1044.3622" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#585858;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="rect4136"
+       width="3"
+       height="7"
+       x="11"
+       y="1041.3623" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="rect4138"
+       width="1"
+       height="2"
+       x="12"
+       y="1042.3623" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+       id="rect4140"
+       width="1"
+       height="2"
+       x="12"
+       y="1045.3623" />
+  </g>
+</svg>
diff --git a/images/presets/vehicle/ford.svg b/images/presets/vehicle/ford.svg
index 5dfee0f..0788212 100644
--- a/images/presets/vehicle/ford.svg
+++ b/images/presets/vehicle/ford.svg
@@ -9,53 +9,40 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
    width="16"
    height="16"
    viewBox="0 0 16 16"
-   id="svg4264"
-   version="1.1"
+   id="svg2"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="ford12.svg">
-  <defs
-     id="defs4266" />
+   sodipodi:docname="ford11.svg">
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-3.9697886"
-     inkscape:cy="2.3971322"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     id="namedview7"
      showgrid="true"
-     units="px"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-others="true"
-     inkscape:snap-global="false"
-     inkscape:snap-center="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-to-guides="true"
-     inkscape:snap-page="true">
+     showguides="false"
+     inkscape:zoom="33.714286"
+     inkscape:cx="5.0591107"
+     inkscape:cy="7.2441084"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
     <inkscape:grid
        type="xygrid"
-       id="grid4137" />
+       id="grid4135" />
   </sodipodi:namedview>
   <metadata
-     id="metadata4269">
+     id="metadata8">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -63,63 +50,40 @@
         <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
-     inkscape:label="Camada 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3621)">
-    <rect
-       style="fill:#ffffff;fill-opacity:1"
-       id="rect4148"
-       width="16.000004"
-       height="16.000004"
-       x="-4.7683727e-007"
-       y="1036.3621"
-       ry="2.3864501" />
-    <path
-       style="fill:#000000"
-       d="m 8.1107127,1037.3621 -1.0610248,3.8423 -5.048498,0.5092 -0.00119,2.8581 c 0,0 1.9439315,-0.017 6.0511112,-0.017 0.1430592,1.601 1.4544383,2.7956 2.9684849,2.7956 1.597498,0 2.980406,-1.3547 2.980406,-3.0788 0,-1.3793 -0.870279,-2.5123 -2.038598,-2.9187 l 0,-3.9779 -3.8506843,0 z"
-       id="path4153"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccsscccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#0070ff;stroke-width:1.73526525;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 0.62451997,1051.114 1.84387033,-1.9325 1.8438702,1.9325 1.8438701,-1.9325 1.8438703,1.9325 1.8438707,-1.9325 1.8438704,1.9325 1.843869,-1.9325 1.843871,1.9325"
-       id="path4181"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff"
-       d="m 8.718716,1038.1256 2.420089,0 0,3.0666 -3.23076,0.024 0.810671,-3.0787 z"
-       id="path4151" />
-    <path
-       style="fill:#ffffff"
-       d="m 11.007668,1043.0395 c 0.762984,0 1.216005,0.5788 1.216005,1.2315 0,0.6527 -0.453021,1.2315 -1.216005,1.2315 -0.762985,0 -1.2160071,-0.5788 -1.2160071,-1.2315 0,-0.6527 0.4530221,-1.2315 1.2160071,-1.2315 z"
-       id="path4149" />
-    <circle
-       r="1.7789224"
-       cy="1045.5714"
-       cx="4.4972916"
-       id="circle4145"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4143"
-       cx="4.4972916"
-       cy="1045.5714"
-       r="0.91713595" />
-  </g>
+  <defs
+     id="defs6" />
+  <rect
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape [...]
+     id="rect4137"
+     width="16"
+     height="16"
+     x="0"
+     y="0"
+     ry="2" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="2"
+     id="canvas"
+     style="visibility:hidden;fill:none;stroke:none" />
+  <path
+     style="color:#000000;fill:#000000;fill-opacity:1"
+     d="M 5,1 1,4 5,7 5,5 11,5 11,7 15,4 11,1 11,3 5,3 Z"
+     id="path4141"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccc" />
+  <path
+     style="color:#000000;fill:#41a8e2;fill-opacity:1"
+     d="M 2.6666667,7.6666667 C 1.9548023,7.6666667 0.6769531,9 0,9 l 0,2 C 0.7162452,11 2.0338983,9.666667 2.6666667,9.666667 3.3389831,9.666667 4.6214689,11 5.3333333,11 5.9673364,11 7.3230469,9.666667 8,9.666667 8.6723164,9.666667 10.028974,11 10.666667,11 11.338983,11 12.700565,9.666667 13.333333,9.666667 13.966101,9.666667 15.327684,11 16,11 L 16,9 C 15.446328,9 14.045197,7.6271187 13.333333,7.6666667 12.69564,7.6666667 11.379629,9 10.666667,9 10.073446,9 8.6723164,7.6666667 8,7.666 [...]
+     id="path4139"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;fill:#41a8e2;fill-opacity:1"
+     d="M 2.6666667,11.666667 C 1.9548023,11.666667 0.6769531,13 0,13 l 0,2 C 0.7162452,15 2.0338983,13.666667 2.6666667,13.666667 3.3389831,13.666667 4.6214689,15 5.3333333,15 5.9673364,15 7.3230469,13.666667 8,13.666667 8.6723164,13.666667 10.028974,15 10.666667,15 11.338983,15 12.700565,13.666667 13.333333,13.666667 13.966101,13.666667 15.327684,15 16,15 l 0,-2 C 15.446328,13 14.045197,11.627119 13.333333,11.666667 12.69564,11.666667 11.379629,13 10.666667,13 10.073446,13 8.6723164,11 [...]
+     id="ford"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/linux/latest/usr/bin/josm-latest b/linux/latest/usr/bin/josm-latest
index 0f2d03b..9d1504b 100755
--- a/linux/latest/usr/bin/josm-latest
+++ b/linux/latest/usr/bin/josm-latest
@@ -24,7 +24,7 @@ if [ -f /etc/default/josm-latest ]; then
     . /etc/default/josm-latest
 fi
 
-JAVA_OPTS="-Djosm.restart=true -Djosm.home=$HOME/.josm-latest -Djava.net.useSystemProxies=true $JAVA_OPTS"
+JAVA_OPTS="-Djosm.restart=true -Djosm.dir.name=JOSM-latest -Djava.net.useSystemProxies=true $JAVA_OPTS"
 
 if [ -z "${JAVACMD}" ]; then
     for jcmd in $JAVA_CMDS; do
diff --git a/netbeans/nbproject/project.properties b/netbeans/nbproject/project.properties
index 3f5e876..1c5a22f 100644
--- a/netbeans/nbproject/project.properties
+++ b/netbeans/nbproject/project.properties
@@ -31,9 +31,9 @@ dist.jar=${dist.dir}/josm.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/z/**,org/apache/commons/jcs/admin [...]
-file.reference.commons-collections-3.2.jar=../test/lib/unitils-core/commons-collections-3.2.jar
-file.reference.commons-lang-2.3.jar=../test/lib/unitils-core/commons-lang-2.3.jar
-file.reference.commons-logging-1.1.jar=../test/lib/unitils-core/commons-logging-1.1.jar
+file.reference.commons-collections-3.2.2.jar=../test/lib/unitils-core/commons-collections-3.2.2.jar
+file.reference.commons-lang-2.6.jar=../test/lib/unitils-core/commons-lang-2.6.jar
+file.reference.commons-logging-1.1.3.jar=../test/lib/unitils-core/commons-logging-1.1.3.jar
 file.reference.core-src=../src
 file.reference.debug-1.0.jar=../test/lib/fest/debug-1.0.jar
 file.reference.equalsverifier-2.1.5.jar=../test/lib/equalsverifier-2.1.5.jar
@@ -42,16 +42,19 @@ 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
 file.reference.fest-util-1.0.jar=../test/lib/fest/fest-util-1.0.jar
 file.reference.findbugs.jar=../tools/findbugs/findbugs.jar
+file.reference.guava-19.0.jar=../test/lib/reflections/guava-19.0.jar
 file.reference.hamcrest-core-1.3.jar=../test/lib/junit/hamcrest-core-1.3.jar
+file.reference.javassist-3.20.0-GA.jar=../test/lib/reflections/javassist-3.20.0-GA.jar
 file.reference.jcip-annotations-1.0.jar=../test/lib/fest/jcip-annotations-1.0.jar
 file.reference.jfcunit.jar=../test/lib/jfcunit.jar
 file.reference.junit-4.12.jar=../test/lib/junit/junit-4.12.jar
 file.reference.MRJToolkitStubs-1.0.jar=../test/lib/fest/MRJToolkitStubs-1.0.jar
 file.reference.ognl-2.6.9.jar=../test/lib/unitils-core/ognl-2.6.9.jar
+file.reference.reflections-0.9.10.jar=../test/lib/reflections/reflections-0.9.10.jar
 file.reference.test-functional=../test/functional
 file.reference.test-performance=../test/performance
 file.reference.test-unit=../test/unit
-file.reference.unitils-core-3.4.2.jar=../test/lib/unitils-core/unitils-core-3.4.2.jar
+file.reference.unitils-core-3.4.3.jar=../test/lib/unitils-core/unitils-core-3.4.3.jar
 includes=**/*.java
 jar.compress=false
 javac.classpath=
@@ -76,11 +79,14 @@ javac.test.classpath=\
     ${file.reference.fest-swing-1.1.jar}:\
     ${file.reference.fest-util-1.0.jar}:\
     ${file.reference.jcip-annotations-1.0.jar}:\
-    ${file.reference.commons-collections-3.2.jar}:\
-    ${file.reference.commons-lang-2.3.jar}:\
-    ${file.reference.commons-logging-1.1.jar}:\
+    ${file.reference.guava-19.0.jar}:\
+    ${file.reference.javassist-3.20.0-GA.jar}:\
+    ${file.reference.reflections-0.9.10.jar}:\
+    ${file.reference.commons-collections-3.2.2.jar}:\
+    ${file.reference.commons-lang-2.6.jar}:\
+    ${file.reference.commons-logging-1.1.3.jar}:\
     ${file.reference.ognl-2.6.9.jar}:\
-    ${file.reference.unitils-core-3.4.2.jar}:\
+    ${file.reference.unitils-core-3.4.3.jar}:\
     ${file.reference.findbugs.jar}
 javac.test.processorpath=\
     ${javac.test.classpath}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDisk.java b/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDisk.java
index 2b7219f..261026a 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDisk.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDisk.java
@@ -26,12 +26,12 @@ import java.io.RandomAccessFile;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.jcs.engine.behavior.IElementSerializer;
 import org.apache.commons.jcs.utils.serialization.StandardSerializer;
-import org.apache.commons.jcs.utils.struct.SingleLinkedList;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -63,7 +63,7 @@ public class BlockDisk
     private final AtomicInteger numberOfBlocks = new AtomicInteger(0);
 
     /** Empty blocks that can be reused. */
-    private final SingleLinkedList<Integer> emptyBlocks = new SingleLinkedList<Integer>();
+    private final ConcurrentLinkedQueue<Integer> emptyBlocks = new ConcurrentLinkedQueue<Integer>();
 
     /** The serializer. */
     private final IElementSerializer elementSerializer;
@@ -145,7 +145,7 @@ public class BlockDisk
         // get them from the empty list or take the next one
         for (int i = 0; i < numBlocksNeeded; i++)
         {
-            Integer emptyBlock = emptyBlocks.takeFirst();
+            Integer emptyBlock = emptyBlocks.poll();
             if (emptyBlock == null)
             {
                 emptyBlock = Integer.valueOf(numberOfBlocks.getAndIncrement());
@@ -366,7 +366,7 @@ public class BlockDisk
         {
             for ( short i = 0; i < blocksToFree.length; i++ )
             {
-                emptyBlocks.addLast( Integer.valueOf( blocksToFree[i] ) );
+                emptyBlocks.offer( Integer.valueOf( blocksToFree[i] ) );
             }
         }
     }
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java b/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
index 6842187..707571b 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
@@ -558,7 +558,7 @@ public class BlockDiskCache<K, V>
         return removed;
     }
 
-    
+
 	private boolean performSingleKeyRemoval(K key) {
 		boolean removed;
 		// remove single item.
@@ -733,17 +733,6 @@ public class BlockDiskCache<K, V>
     }
 
     /**
-     * Gets basic stats for the disk cache.
-     * <p>
-     * @return String
-     */
-    @Override
-    public String getStats()
-    {
-        return getStatistics().toString();
-    }
-
-    /**
      * Returns info about the disk cache.
      * <p>
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getStatistics()
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
index b39117c..28d79b2 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
@@ -33,6 +33,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -53,7 +54,6 @@ import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
 import org.apache.commons.jcs.engine.stats.behavior.IStats;
 import org.apache.commons.jcs.utils.struct.AbstractLRUMap;
 import org.apache.commons.jcs.utils.struct.LRUMap;
-import org.apache.commons.jcs.utils.struct.SortedPreferentialArray;
 import org.apache.commons.jcs.utils.timing.ElapsedTimer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -114,10 +114,11 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
     private boolean queueInput = false;
 
     /** list where puts made during optimization are made */
-    private final LinkedList<IndexedDiskElementDescriptor> queuedPutList = new LinkedList<IndexedDiskElementDescriptor>();
+    private final ConcurrentSkipListSet<IndexedDiskElementDescriptor> queuedPutList =
+            new ConcurrentSkipListSet<IndexedDiskElementDescriptor>(new PositionComparator());
 
     /** RECYLCE BIN -- array of empty spots */
-    private SortedPreferentialArray<IndexedDiskElementDescriptor> recycle;
+    private ConcurrentSkipListSet<IndexedDiskElementDescriptor> recycle;
 
     /** User configurable parameters */
     private final IndexedDiskCacheAttributes cattr;
@@ -198,7 +199,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
                 doOptimizeRealTime();
             }
         }
-        catch (Exception e)
+        catch (IOException e)
         {
             log.error(
                 logCacheName + "Failure initializing for fileName: " + fileName + " and directory: "
@@ -229,9 +230,8 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
      *
      * @param cattr
      * @throws IOException
-     * @throws InterruptedException
      */
-    private void initializeKeysAndData(IndexedDiskCacheAttributes cattr) throws IOException, InterruptedException
+    private void initializeKeysAndData(IndexedDiskCacheAttributes cattr) throws IOException
     {
         this.dataFile = new IndexedDisk(new File(rafDir, fileName + ".data"), getElementSerializer());
         this.keyFile = new IndexedDisk(new File(rafDir, fileName + ".key"), getElementSerializer());
@@ -279,10 +279,9 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
      * files are cleared.
      * <p>
      *
-     * @throws InterruptedException
      * @throws IOException
      */
-    private void initializeStoreFromPersistedData() throws InterruptedException, IOException
+    private void initializeStoreFromPersistedData() throws IOException
     {
         loadKeys();
 
@@ -313,11 +312,8 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
     /**
      * Loads the keys from the .key file. The keys are stored in a HashMap on disk. This is
      * converted into a LRUMap.
-     * <p>
-     *
-     * @throws InterruptedException
      */
-    protected void loadKeys() throws InterruptedException
+    protected void loadKeys()
     {
         if (log.isDebugEnabled())
         {
@@ -331,8 +327,8 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
             // create a key map to use.
             initializeKeyMap();
 
-            HashMap<K, IndexedDiskElementDescriptor> keys = keyFile.readObject(new IndexedDiskElementDescriptor(0, (int) keyFile
-                .length() - IndexedDisk.HEADER_SIZE_BYTES));
+            HashMap<K, IndexedDiskElementDescriptor> keys = keyFile.readObject(
+                new IndexedDiskElementDescriptor(0, (int) keyFile.length() - IndexedDisk.HEADER_SIZE_BYTES));
 
             if (keys != null)
             {
@@ -406,7 +402,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
                 isOk = checkForDedOverlaps(createPositionSortedDescriptorList());
             }
         }
-        catch (Exception e)
+        catch (IOException e)
         {
             log.error(e);
             isOk = false;
@@ -484,7 +480,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
                 log.info(logCacheName + "Finished saving keys.");
             }
         }
-        catch (Exception e)
+        catch (IOException e)
         {
             log.error(logCacheName + "Problem storing keys.", e);
         }
@@ -543,9 +539,11 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
 
                     if (doRecycle)
                     {
-                        IndexedDiskElementDescriptor rep = recycle.takeNearestLargerOrEqual(ded);
+                        IndexedDiskElementDescriptor rep = recycle.ceiling(ded);
                         if (rep != null)
                         {
+                            // remove element from recycle bin
+                            recycle.remove(rep);
                             ded = rep;
                             ded.len = data.length;
                             recycleCnt++;
@@ -600,7 +598,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
                 log.debug(logCacheName + "Caught ConcurrentModificationException." + cme);
             }
         }
-        catch (Exception e)
+        catch (IOException e)
         {
             log.error(logCacheName + "Failure updating element, key: " + ce.getKey() + " old: " + old, e);
         }
@@ -651,10 +649,6 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
             log.error(logCacheName + "Failure getting from disk, key = " + key, ioe);
             reset();
         }
-        catch (Exception e)
-        {
-            log.error(logCacheName + "Failure getting from disk, key = " + key, e);
-        }
         return object;
     }
 
@@ -670,34 +664,27 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
     public Map<K, ICacheElement<K, V>> processGetMatching(String pattern)
     {
         Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K, V>>();
+        Set<K> keyArray = null;
+        storageLock.readLock().lock();
         try
         {
-            Set<K> keyArray = null;
-            storageLock.readLock().lock();
-            try
-            {
-                keyArray = new HashSet<K>(keyHash.keySet());
-            }
-            finally
-            {
-                storageLock.readLock().unlock();
-            }
+            keyArray = new HashSet<K>(keyHash.keySet());
+        }
+        finally
+        {
+            storageLock.readLock().unlock();
+        }
 
-            Set<K> matchingKeys = getKeyMatcher().getMatchingKeysFromArray(pattern, keyArray);
+        Set<K> matchingKeys = getKeyMatcher().getMatchingKeysFromArray(pattern, keyArray);
 
-            for (K key : matchingKeys)
+        for (K key : matchingKeys)
+        {
+            ICacheElement<K, V> element = processGet(key);
+            if (element != null)
             {
-                ICacheElement<K, V> element = processGet(key);
-                if (element != null)
-                {
-                    elements.put(key, element);
-                }
+                elements.put(key, element);
             }
         }
-        catch (Exception e)
-        {
-            log.error(logCacheName + "Failure getting matching from disk, pattern = " + pattern, e);
-        }
         return elements;
     }
 
@@ -808,11 +795,6 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
                 removed = performSingleKeyRemoval(key);
             }
         }
-        catch (Exception e)
-        {
-            log.error(logCacheName + "Problem removing element.", e);
-            reset = true;
-        }
         finally
         {
             storageLock.writeLock().unlock();
@@ -945,11 +927,6 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
         {
             reset();
         }
-        catch (Exception e)
-        {
-            log.error(logCacheName + "Problem removing all.", e);
-            reset();
-        }
         finally
         {
             logICacheEvent(cacheEvent);
@@ -957,7 +934,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
     }
 
     /**
-     * Reset effectively clears the disk cache, creating new files, recyclebins, and keymaps.
+     * Reset effectively clears the disk cache, creating new files, recycle bins, and keymaps.
      * <p>
      * It can be used to handle errors by last resort, force content update, or removeall.
      */
@@ -965,7 +942,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
     {
         if (log.isWarnEnabled())
         {
-            log.warn(logCacheName + "Reseting cache");
+            log.warn(logCacheName + "Resetting cache");
         }
 
         try
@@ -1017,12 +994,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
      */
     private void initializeRecycleBin()
     {
-        int recycleBinSize = cattr.getMaxRecycleBinSize() >= 0 ? cattr.getMaxRecycleBinSize() : 0;
-        recycle = new SortedPreferentialArray<IndexedDiskElementDescriptor>(recycleBinSize);
-        if (log.isDebugEnabled())
-        {
-            log.debug(logCacheName + "Set recycle max Size to MaxRecycleBinSize: '" + recycleBinSize + "'");
-        }
+        recycle = new ConcurrentSkipListSet<IndexedDiskElementDescriptor>();
     }
 
     /**
@@ -1165,8 +1137,6 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
      * (2) When an item on disk is updated with a value that will not fit in the previous slot. (3) When the max key size is
      * reached, the freed slot will be added.
      * <p>
-     * The recylebin is not a set. If a slot it added twice, it will result in the wrong data being returned.
-     * <p>
      *
      * @param ded
      */
@@ -1306,10 +1276,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
             {
                 if (!queuedPutList.isEmpty())
                 {
-                    // This is perhaps unnecessary, but the list might not be as sorted as we think.
-                    defragList = new IndexedDiskElementDescriptor[queuedPutList.size()];
-                    queuedPutList.toArray(defragList);
-                    Arrays.sort(defragList, new PositionComparator());
+                    defragList = queuedPutList.toArray(new IndexedDiskElementDescriptor[queuedPutList.size()]);
 
                     // pack them at the end
                     expectedNextPos = defragFile(defragList, expectedNextPos);
@@ -1317,7 +1284,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
                 // TRUNCATE THE FILE
                 dataFile.truncate(expectedNextPos);
             }
-            catch (Exception e)
+            catch (IOException e)
             {
                 log.error(logCacheName + "Error optimizing queued puts.", e);
             }
@@ -1441,7 +1408,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
     }
 
     /**
-     * Returns the size of the recyclebin in number of elements.
+     * Returns the size of the recycle bin in number of elements.
      * <p>
      *
      * @return The number of items in the bin.
@@ -1576,21 +1543,8 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
     }
 
     /**
-     * Gets basic stats for the disk cache.
-     * <p>
-     *
-     * @return String
-     */
-    @Override
-    public String getStats()
-    {
-        return getStatistics().toString();
-    }
-
-    /**
      * Returns info about the disk cache.
      * <p>
-     * (non-Javadoc)
      *
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getStatistics()
      */
@@ -1609,7 +1563,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
             elems
                 .add(new StatElement<Long>("Data File Length", Long.valueOf(this.dataFile != null ? this.dataFile.length() : -1L)));
         }
-        catch (Exception e)
+        catch (IOException e)
         {
             log.error(e);
         }
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java
index e946c33..fffaadb 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java
@@ -36,14 +36,6 @@ public class IndexedDiskCacheAttributes
     /** -1 means no limit. */
     private int maxKeySize = DEFAULT_maxKeySize;
 
-    /** default value */
-    private static final int DEFAULT_maxRecycleBinSize = 5000;
-
-    /**
-     * Cannot be larger than the max size. If max is less than 0, this will be 5000
-     */
-    private int maxRecycleBinSize = DEFAULT_maxRecycleBinSize;
-
     /** default to -1, i.e., don't optimize until shutdown */
     private int optimizeAtRemoveCount = -1;
 
@@ -56,7 +48,7 @@ public class IndexedDiskCacheAttributes
     /** Should we clear the disk on startup. */
     public static final boolean DEFAULT_CLEAR_DISK_ON_STARTUP = false;
 
-    /** Should we clear the disk on startup. If true the congtents of disk are cleared. */
+    /** Should we clear the disk on startup. If true the contents of disk are cleared. */
     private boolean clearDiskOnStartup = DEFAULT_CLEAR_DISK_ON_STARTUP;
 
     /**
@@ -85,9 +77,6 @@ public class IndexedDiskCacheAttributes
     public void setMaxKeySize( int maxKeySize )
     {
         this.maxKeySize = maxKeySize;
-
-        // make sure the sizes are in accord with our rule.
-        setMaxRecycleBinSize( maxRecycleBinSize );
     }
 
     /**
@@ -112,27 +101,6 @@ public class IndexedDiskCacheAttributes
     }
 
     /**
-     * This cannot be larger than the maxKeySize. It wouldn't hurt anything, but it makes the config
-     * necessary. The recycle bin entry willbe at least as large as a key.
-     * <p>
-     * If the maxKeySize is -1 this will be set tot he default, which is 5000.
-     * <p>
-     * @param maxRecycleBinSize The maxRecycleBinSize to set.
-     */
-    public void setMaxRecycleBinSize( int maxRecycleBinSize )
-    {
-        this.maxRecycleBinSize = maxRecycleBinSize;
-    }
-
-    /**
-     * @return Returns the maxRecycleBinSize.
-     */
-    public int getMaxRecycleBinSize()
-    {
-        return maxRecycleBinSize;
-    }
-
-    /**
      * @param optimizeOnShutdown The optimizeOnShutdown to set.
      */
     public void setOptimizeOnShutdown( boolean optimizeOnShutdown )
@@ -177,7 +145,6 @@ public class IndexedDiskCacheAttributes
         str.append( "\n diskPath = " + super.getDiskPath() );
         str.append( "\n maxPurgatorySize   = " + super.getMaxPurgatorySize() );
         str.append( "\n maxKeySize  = " + maxKeySize );
-        str.append( "\n maxRecycleBinSize  = " + maxRecycleBinSize );
         str.append( "\n optimizeAtRemoveCount  = " + optimizeAtRemoveCount );
         str.append( "\n shutdownSpoolTimeLimit  = " + super.getShutdownSpoolTimeLimit() );
         str.append( "\n optimizeOnShutdown  = " + optimizeOnShutdown );
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
index 12435c1..5f5af18 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
@@ -78,16 +78,21 @@ public class IndexedDiskElementDescriptor
     @Override
     public boolean equals(Object o)
     {
-        if (o instanceof IndexedDiskElementDescriptor)
+    	if (o == null)
+    	{
+    		return false;
+    	}
+    	else if (o instanceof IndexedDiskElementDescriptor)
         {
-            return compareTo((IndexedDiskElementDescriptor) o) == 0;
+    		IndexedDiskElementDescriptor ided = (IndexedDiskElementDescriptor)o;
+            return pos == ided.pos && len == ided.len;
         }
 
         return false;
     }
 
     /**
-     * Compares based on length.
+     * Compares based on length, then on pos descending.
      * <p>
      * @param o Object
      * @return int
@@ -100,19 +105,28 @@ public class IndexedDiskElementDescriptor
             return 1;
         }
 
-        int oLen = o.len;
-        if ( oLen == len )
+        if ( o.len == len )
         {
-            return 0;
+        	if ( o.pos == pos )
+        	{
+        		return 0;
+        	}
+        	else if ( o.pos < pos )
+        	{
+        		return -1;
+        	}
+        	else
+        	{
+        		return 1;
+        	}
         }
-        else if ( oLen > len )
+        else if ( o.len > len )
         {
             return -1;
         }
-        else if ( oLen < len )
+        else
         {
             return 1;
         }
-        return 0;
     }
 }
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
index 0a39f97..0160792 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
@@ -128,7 +128,7 @@ public class HSQLDiskCacheFactory
         }
 
         Connection cConn = DriverManager.getConnection( database, user, password );
-        setupTABLE( cConn, attributes.getTableName() );
+        setupTable( cConn, attributes.getTableName() );
 
         if ( log.isInfoEnabled() )
         {
@@ -144,10 +144,8 @@ public class HSQLDiskCacheFactory
      * @param cConn
      * @param tableName
      */
-    private void setupTABLE( Connection cConn, String tableName ) throws SQLException
+    protected void setupTable( Connection cConn, String tableName ) throws SQLException
     {
-        boolean newT = true;
-
         // TODO make the cached nature of the table configurable
         StringBuilder createSql = new StringBuilder();
         createSql.append( "CREATE CACHED TABLE ").append( tableName );
@@ -155,8 +153,8 @@ public class HSQLDiskCacheFactory
         createSql.append( "CACHE_KEY             VARCHAR(250)          NOT NULL, " );
         createSql.append( "REGION                VARCHAR(250)          NOT NULL, " );
         createSql.append( "ELEMENT               BINARY, " );
-        createSql.append( "CREATE_TIME           DATE, " );
-        createSql.append( "CREATE_TIME_SECONDS   BIGINT, " );
+        createSql.append( "CREATE_TIME           TIMESTAMP, " );
+        createSql.append( "UPDATE_TIME_SECONDS   BIGINT, " );
         createSql.append( "MAX_LIFE_SECONDS      BIGINT, " );
         createSql.append( "SYSTEM_EXPIRE_TIME_SECONDS      BIGINT, " );
         createSql.append( "IS_ETERNAL            CHAR(1), " );
@@ -171,11 +169,7 @@ public class HSQLDiskCacheFactory
         }
         catch ( SQLException e )
         {
-            if ("23000".equals(e.getSQLState()))
-            {
-                newT = false;
-            }
-            else
+            if (!"23000".equals(e.getSQLState()))
             {
                 throw e;
             }
@@ -184,31 +178,5 @@ public class HSQLDiskCacheFactory
         {
             sStatement.close();
         }
-
-        if ( newT )
-        {
-            // TODO create an index on SYSTEM_EXPIRE_TIME_SECONDS
-            String setupData[] = { "create index iKEY on " + tableName + " (CACHE_KEY, REGION)" };
-            Statement iStatement = cConn.createStatement();
-
-            try
-            {
-                for ( int i = 0; i < setupData.length; i++ )
-                {
-                    try
-                    {
-                        iStatement.execute( setupData[i] );
-                    }
-                    catch ( SQLException e )
-                    {
-                        log.error( "Exception caught when creating index.", e );
-                    }
-                }
-            }
-            finally
-            {
-                iStatement.close();
-            }
-        }
     }
 }
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java b/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
index b853666..98cdf21 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
@@ -50,7 +50,7 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
     private static final Log log = LogFactory.getLog( AbstractRemoteCacheNoWaitFacade.class );
 
     /** The connection to a remote server, or a zombie. */
-    private List<RemoteCacheNoWait<K, V>> noWaits;
+    protected List<RemoteCacheNoWait<K, V>> noWaits;
 
     /** holds failover and cluster information */
     private IRemoteCacheAttributes remoteCacheAttributes;
@@ -75,7 +75,8 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
         this.noWaits = new ArrayList<RemoteCacheNoWait<K,V>>();
         for (ICache<K, V> nw : noWaits)
         {
-            this.noWaits.add((RemoteCacheNoWait<K,V>) nw);
+            RemoteCacheNoWait<K,V> rcnw = (RemoteCacheNoWait<K,V>) nw;
+            this.noWaits.add(rcnw);
         }
         this.remoteCacheAttributes = rca;
         setCacheEventLogger( cacheEventLogger );
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
index b72b337..128d188 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
@@ -49,6 +49,9 @@ public class RemoteCache<K, V>
     /** for error notifications */
     private RemoteCacheMonitor monitor;
 
+    /** back link for failover initiation */
+    private AbstractRemoteCacheNoWaitFacade<K, V> facade;
+
     /**
      * Constructor for the RemoteCache object. This object communicates with a remote cache server.
      * One of these exists for each region. This also holds a reference to a listener. The same
@@ -100,6 +103,16 @@ public class RemoteCache<K, V>
     }
 
     /**
+     * Set facade
+     *
+     * @param facade the facade to set
+     */
+    protected void setFacade(AbstractRemoteCacheNoWaitFacade<K, V> facade)
+    {
+        this.facade = facade;
+    }
+
+    /**
      * Handles exception by disabling the remote cache service before re-throwing the exception in
      * the form of an IOException.
      * <p>
@@ -128,15 +141,12 @@ public class RemoteCache<K, V>
         // process.
         monitor.notifyError();
 
-        // initiate failover if local
-        RemoteCacheNoWaitFacade<K, V> rcnwf = RemoteCacheFactory.getFacade( getRemoteCacheAttributes().getCacheName() );
-
         if ( log.isDebugEnabled() )
         {
-            log.debug( "Initiating failover, rcnwf = " + rcnwf );
+            log.debug( "Initiating failover, rcnwf = " + facade );
         }
 
-        if ( rcnwf != null && rcnwf.getAuxiliaryCacheAttributes().getRemoteType() == RemoteType.LOCAL )
+        if ( facade != null && facade.getAuxiliaryCacheAttributes().getRemoteType() == RemoteType.LOCAL )
         {
             if ( log.isDebugEnabled() )
             {
@@ -144,7 +154,7 @@ public class RemoteCache<K, V>
             }
             // may need to remove the noWait index here. It will be 0 if it is
             // local since there is only 1 possible listener.
-            rcnwf.failover( rcnwf.getPrimaryServer() );
+            facade.failover( facade.getPrimaryServer() );
         }
 
         if ( ex instanceof IOException )
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
index daa9ee2..a7b5581 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
@@ -46,17 +46,14 @@ import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
 public class RemoteCacheFactory
     extends AbstractAuxiliaryCacheFactory
 {
-    /** store reference of facades to initiate failover */
-    private static ConcurrentMap<String, RemoteCacheNoWaitFacade<?, ?>> facades;
-
     /** Monitor thread */
-    private static RemoteCacheMonitor monitor;
+    private RemoteCacheMonitor monitor;
 
     /** Contains mappings of RemoteLocation instance to RemoteCacheManager instance. */
-    private static ConcurrentMap<RemoteLocation, RemoteCacheManager> managers;
+    private ConcurrentMap<RemoteLocation, RemoteCacheManager> managers;
 
     /** Lock for initialization of manager instances */
-    private static Lock managerLock;
+    private Lock managerLock;
 
     /**
      * For LOCAL clients we get a handle to all the failovers, but we do not register a listener
@@ -156,9 +153,7 @@ public class RemoteCacheFactory
         }
 
         RemoteCacheNoWaitFacade<K, V> rcnwf =
-            new RemoteCacheNoWaitFacade<K, V>(noWaits, rca, cacheMgr, cacheEventLogger, elementSerializer );
-
-        facades.put( rca.getCacheName(), rcnwf );
+            new RemoteCacheNoWaitFacade<K, V>(noWaits, rca, cacheMgr, cacheEventLogger, elementSerializer, this );
 
         return rcnwf;
     }
@@ -166,18 +161,6 @@ public class RemoteCacheFactory
     // end createCache
 
     /**
-     * The facades are what the cache hub talks to.
-     *
-     * @param cacheName the name of the  cache facade
-     * @return Returns the facade for the given name.
-     */
-    @SuppressWarnings("unchecked") // Need to cast because of common map for all facades
-    public static <K, V> RemoteCacheNoWaitFacade<K, V> getFacade( String cacheName )
-    {
-        return (RemoteCacheNoWaitFacade<K, V>) facades.get( cacheName );
-    }
-
-    /**
      * Returns an instance of RemoteCacheManager for the given connection parameters.
      * <p>
      * Host and Port uniquely identify a manager instance.
@@ -186,7 +169,7 @@ public class RemoteCacheFactory
      *
      * @return The instance value or null if no such manager exists
      */
-    public static RemoteCacheManager getManager( IRemoteCacheAttributes cattr )
+    public RemoteCacheManager getManager( IRemoteCacheAttributes cattr )
     {
         if ( cattr.getRemoteLocation() == null )
         {
@@ -213,17 +196,11 @@ public class RemoteCacheFactory
      * @param elementSerializer
      * @return The instance value, never null
      */
-    public static RemoteCacheManager getManager( IRemoteCacheAttributes cattr, ICompositeCacheManager cacheMgr,
+    public RemoteCacheManager getManager( IRemoteCacheAttributes cattr, ICompositeCacheManager cacheMgr,
                                                   ICacheEventLogger cacheEventLogger,
                                                   IElementSerializer elementSerializer )
     {
-        if ( cattr.getRemoteLocation() == null )
-        {
-            cattr.setRemoteLocation("", Registry.REGISTRY_PORT);
-        }
-
-        RemoteLocation loc = cattr.getRemoteLocation();
-        RemoteCacheManager ins = managers.get( loc );
+        RemoteCacheManager ins = getManager( cattr );
 
         if ( ins == null )
         {
@@ -231,12 +208,12 @@ public class RemoteCacheFactory
 
             try
             {
-                ins = managers.get( loc );
+                ins = managers.get( cattr.getRemoteLocation() );
 
                 if (ins == null)
                 {
                     ins = new RemoteCacheManager( cattr, cacheMgr, monitor, cacheEventLogger, elementSerializer);
-                    managers.put( loc, ins );
+                    managers.put( cattr.getRemoteLocation(), ins );
                     monitor.addManager(ins);
                 }
             }
@@ -256,7 +233,6 @@ public class RemoteCacheFactory
 	public void initialize()
 	{
 		super.initialize();
-		facades = new ConcurrentHashMap<String, RemoteCacheNoWaitFacade<?, ?>>();
 
 		managers = new ConcurrentHashMap<RemoteLocation, RemoteCacheManager>();
 		managerLock = new ReentrantLock();
@@ -277,7 +253,6 @@ public class RemoteCacheFactory
 		}
 
 		managers.clear();
-		facades.clear();
 
         if (monitor != null)
         {
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
index 994adb7..8a8c4a9 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
@@ -52,16 +52,21 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
     /** The facade returned to the composite cache. */
     private final RemoteCacheNoWaitFacade<K, V> facade;
 
+    /** Factory instance */
+    private final RemoteCacheFactory cacheFactory;
+
     /**
      * Constructor for the RemoteCacheFailoverRunner object. This allows the
      * FailoverRunner to modify the facade that the CompositeCache references.
      *
      * @param facade the facade the CompositeCache talks to.
+     * @param cacheFactory the cache factory instance
      */
-    public RemoteCacheFailoverRunner( RemoteCacheNoWaitFacade<K, V> facade )
+    public RemoteCacheFailoverRunner( RemoteCacheNoWaitFacade<K, V> facade, RemoteCacheFactory cacheFactory )
     {
         super("JCS-RemoteCacheFailoverRunner");
         this.facade = facade;
+        this.cacheFactory = cacheFactory;
         setIdlePeriod(20000L);
     }
 
@@ -180,7 +185,7 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
 
                     RemoteCacheAttributes rca = (RemoteCacheAttributes) rca0.clone();
                     rca.setRemoteLocation(server);
-                    RemoteCacheManager rcm = RemoteCacheFactory.getManager( rca );
+                    RemoteCacheManager rcm = cacheFactory.getManager( rca );
 
                     if ( log.isDebugEnabled() )
                     {
@@ -294,7 +299,7 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
 
         RemoteCacheAttributes rca = (RemoteCacheAttributes) rca0.clone();
         rca.setRemoteLocation(server);
-        RemoteCacheManager rcm = RemoteCacheFactory.getManager( rca );
+        RemoteCacheManager rcm = cacheFactory.getManager( rca );
 
         if (rcm != null)
         {
@@ -336,7 +341,7 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
                                 // previous failed over configuration.
                                 RemoteCacheAttributes rcaOld = (RemoteCacheAttributes) rca0.clone();
                                 rcaOld.setRemoteLocation(serverOld);
-                                RemoteCacheManager rcmOld = RemoteCacheFactory.getManager( rcaOld );
+                                RemoteCacheManager rcmOld = cacheFactory.getManager( rcaOld );
 
                                 if ( rcmOld != null )
                                 {
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
index c0f9e10..f216560 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
@@ -54,7 +54,8 @@ public class RemoteCacheManager
     private static final Log log = LogFactory.getLog( RemoteCacheManager.class );
 
     /** Contains instances of RemoteCacheNoWait managed by a RemoteCacheManager instance. */
-    final ConcurrentMap<String, RemoteCacheNoWait<?, ?>> caches = new ConcurrentHashMap<String, RemoteCacheNoWait<?, ?>>();
+    private final ConcurrentMap<String, RemoteCacheNoWait<?, ?>> caches =
+            new ConcurrentHashMap<String, RemoteCacheNoWait<?, ?>>();
 
     /** Lock for initialization of caches */
     private ReentrantLock cacheLock = new ReentrantLock();
@@ -260,34 +261,7 @@ public class RemoteCacheManager
 
                 if (remoteCacheNoWait == null)
                 {
-                    // create a listener first and pass it to the remotecache
-                    // sender.
-                    RemoteCacheListener<K, V> listener = null;
-                    try
-                    {
-                        listener = new RemoteCacheListener<K, V>( cattr, cacheMgr, elementSerializer );
-                        addRemoteCacheListener( cattr, listener );
-                    }
-                    catch ( IOException ioe )
-                    {
-                        log.error( "Problem adding listener. Message: " + ioe.getMessage()
-                            + " | RemoteCacheListener = " + listener, ioe );
-                    }
-                    catch ( Exception e )
-                    {
-                        log.error( "Problem adding listener. Message: " + e.getMessage() + " | RemoteCacheListener = "
-                            + listener, e );
-                    }
-
-                    IRemoteCacheClient<K, V> remoteCacheClient =
-                        new RemoteCache<K, V>( cattr, (ICacheServiceNonLocal<K, V>) remoteService, listener, monitor );
-                    remoteCacheClient.setCacheEventLogger( cacheEventLogger );
-                    remoteCacheClient.setElementSerializer( elementSerializer );
-
-                    remoteCacheNoWait = new RemoteCacheNoWait<K, V>( remoteCacheClient );
-                    remoteCacheNoWait.setCacheEventLogger( cacheEventLogger );
-                    remoteCacheNoWait.setElementSerializer( elementSerializer );
-
+                    remoteCacheNoWait = newRemoteCacheNoWait(cattr);
                     caches.put( cattr.getCacheName(), remoteCacheNoWait );
                 }
             }
@@ -302,6 +276,46 @@ public class RemoteCacheManager
         return remoteCacheNoWait;
     }
 
+    /**
+     * Create new RemoteCacheNoWait instance
+     *
+     * @param cattr the cache configuration
+     * @return the instance
+     */
+    protected <K, V> RemoteCacheNoWait<K, V> newRemoteCacheNoWait(IRemoteCacheAttributes cattr)
+    {
+        RemoteCacheNoWait<K, V> remoteCacheNoWait;
+        // create a listener first and pass it to the remotecache
+        // sender.
+        RemoteCacheListener<K, V> listener = null;
+        try
+        {
+            listener = new RemoteCacheListener<K, V>( cattr, cacheMgr, elementSerializer );
+            addRemoteCacheListener( cattr, listener );
+        }
+        catch ( IOException ioe )
+        {
+            log.error( "Problem adding listener. Message: " + ioe.getMessage()
+                + " | RemoteCacheListener = " + listener, ioe );
+        }
+        catch ( Exception e )
+        {
+            log.error( "Problem adding listener. Message: " + e.getMessage() + " | RemoteCacheListener = "
+                + listener, e );
+        }
+
+        IRemoteCacheClient<K, V> remoteCacheClient =
+            new RemoteCache<K, V>( cattr, (ICacheServiceNonLocal<K, V>) remoteService, listener, monitor );
+        remoteCacheClient.setCacheEventLogger( cacheEventLogger );
+        remoteCacheClient.setElementSerializer( elementSerializer );
+
+        remoteCacheNoWait = new RemoteCacheNoWait<K, V>( remoteCacheClient );
+        remoteCacheNoWait.setCacheEventLogger( cacheEventLogger );
+        remoteCacheNoWait.setElementSerializer( elementSerializer );
+
+        return remoteCacheNoWait;
+    }
+
     /** Shutdown all. */
     public void release()
     {
@@ -326,6 +340,8 @@ public class RemoteCacheManager
                     log.error( "Problem releasing " + c.getCacheName(), ex );
                 }
             }
+
+            caches.clear();
         }
         finally
         {
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java
index d4600c7..122dbaa 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java
@@ -470,7 +470,6 @@ public class RemoteCacheNoWait<K, V>
     /**
      * Returns the stats and the cache.toString().
      * <p>
-     * (non-Javadoc)
      * @see java.lang.Object#toString()
      */
     @Override
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
index 744f468..51333ce 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
@@ -44,6 +44,9 @@ public class RemoteCacheNoWaitFacade<K, V>
     /** log instance */
     private static final Log log = LogFactory.getLog( RemoteCacheNoWaitFacade.class );
 
+    /** Provide factory instance to RemoteCacheFailoverRunner */
+    private final RemoteCacheFactory cacheFactory;
+
     /**
      * Constructs with the given remote cache, and fires events to any listeners.
      * <p>
@@ -52,14 +55,23 @@ public class RemoteCacheNoWaitFacade<K, V>
      * @param cacheMgr
      * @param cacheEventLogger
      * @param elementSerializer
+     * @param cacheFactory
      */
     public RemoteCacheNoWaitFacade( List<ICache<K, V>> noWaits,
                                     RemoteCacheAttributes rca,
                                     ICompositeCacheManager cacheMgr,
                                     ICacheEventLogger cacheEventLogger,
-                                    IElementSerializer elementSerializer )
+                                    IElementSerializer elementSerializer,
+                                    RemoteCacheFactory cacheFactory)
     {
         super( noWaits, rca, cacheMgr, cacheEventLogger, elementSerializer );
+        this.cacheFactory = cacheFactory;
+
+        for (RemoteCacheNoWait<K,V> rcnw : this.noWaits)
+        {
+            ((RemoteCache<K, V>)rcnw.getRemoteCache()).setFacade(this);
+            this.noWaits.add(rcnw);
+        }
     }
 
     /**
@@ -80,7 +92,7 @@ public class RemoteCacheNoWaitFacade<K, V>
             if ( rcnw.getStatus() == CacheStatus.ERROR )
             {
                 // start failover, primary recovery process
-                RemoteCacheFailoverRunner<K, V> runner = new RemoteCacheFailoverRunner<K, V>( this );
+                RemoteCacheFailoverRunner<K, V> runner = new RemoteCacheFailoverRunner<K, V>( this, this.cacheFactory );
                 runner.setDaemon( true );
                 runner.start();
                 runner.notifyError();
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/client/AbstractHttpClient.java b/src/org/apache/commons/jcs/auxiliary/remote/http/client/AbstractHttpClient.java
index a68f31a..71cd9ec 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/client/AbstractHttpClient.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/client/AbstractHttpClient.java
@@ -1,5 +1,7 @@
 package org.apache.commons.jcs.auxiliary.remote.http.client;
 
+import java.io.IOException;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -28,12 +30,10 @@ import org.apache.commons.httpclient.cookie.CookiePolicy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.IOException;
-
 /**
  * This class simply configures the http multithreaded connection manager.
  * <p>
- * This is abstract because it can't do anything. Child classes can overwrite whatever they want.
+ * This is abstract because it can do anything. Child classes can overwrite whatever they want.
  */
 public abstract class AbstractHttpClient
 {
@@ -57,13 +57,9 @@ public abstract class AbstractHttpClient
      */
     public AbstractHttpClient( RemoteHttpCacheAttributes remoteHttpCacheAttributes )
     {
-        setRemoteHttpCacheAttributes( remoteHttpCacheAttributes );
-        setConnectionManager( new MultiThreadedHttpConnectionManager() );
-
-        // THIS IS NOT THREAD SAFE:
-        // setHttpClient( new HttpClient() );
-        // THIS IS:
-        setHttpClient( new HttpClient( getConnectionManager() ) );
+        this.remoteHttpCacheAttributes = remoteHttpCacheAttributes;
+        this.connectionManager = new MultiThreadedHttpConnectionManager();
+        this.httpClient = new HttpClient(this.connectionManager);
 
         configureClient();
     }
@@ -71,27 +67,28 @@ public abstract class AbstractHttpClient
     /**
      * Configures the http client.
      */
-    public void configureClient()
+    protected void configureClient()
     {
         if ( getRemoteHttpCacheAttributes().getMaxConnectionsPerHost() > 0 )
         {
-            getConnectionManager().getParams().setMaxTotalConnections(
-                                                                       getRemoteHttpCacheAttributes()
-                                                                           .getMaxConnectionsPerHost() );
+            this.connectionManager.getParams()
+                .setMaxTotalConnections(getRemoteHttpCacheAttributes().getMaxConnectionsPerHost());
+            this.connectionManager.getParams()
+                .setDefaultMaxConnectionsPerHost(getRemoteHttpCacheAttributes().getMaxConnectionsPerHost());
         }
 
-        getConnectionManager().getParams().setSoTimeout( getRemoteHttpCacheAttributes().getSocketTimeoutMillis() );
+        this.connectionManager.getParams().setSoTimeout( getRemoteHttpCacheAttributes().getSocketTimeoutMillis() );
 
         String httpVersion = getRemoteHttpCacheAttributes().getHttpVersion();
         if ( httpVersion != null )
         {
             if ( "1.1".equals( httpVersion ) )
             {
-                getHttpClient().getParams().setParameter( "http.protocol.version", HttpVersion.HTTP_1_1 );
+                this.httpClient.getParams().setParameter( "http.protocol.version", HttpVersion.HTTP_1_1 );
             }
             else if ( "1.0".equals( httpVersion ) )
             {
-                getHttpClient().getParams().setParameter( "http.protocol.version", HttpVersion.HTTP_1_0 );
+                this.httpClient.getParams().setParameter( "http.protocol.version", HttpVersion.HTTP_1_0 );
             }
             else
             {
@@ -99,13 +96,11 @@ public abstract class AbstractHttpClient
             }
         }
 
-        getConnectionManager().getParams().setConnectionTimeout(
-                                                                 getRemoteHttpCacheAttributes()
-                                                                     .getConnectionTimeoutMillis() );
+        this.connectionManager.getParams()
+            .setConnectionTimeout(getRemoteHttpCacheAttributes().getConnectionTimeoutMillis());
 
         // By default we instruct HttpClient to ignore cookies.
-        String cookiePolicy = CookiePolicy.IGNORE_COOKIES;
-        getHttpClient().getParams().setCookiePolicy( cookiePolicy );
+        this.httpClient.getParams().setCookiePolicy( CookiePolicy.IGNORE_COOKIES );
     }
 
     /**
@@ -119,7 +114,7 @@ public abstract class AbstractHttpClient
         throws IOException
     {
         HttpState httpState = preProcessWebserviceCall( post );
-        getHttpClient().executeMethod( null, post, httpState );
+        this.httpClient.executeMethod( null, post, httpState );
         postProcessWebserviceCall( post, httpState );
     }
 
@@ -130,7 +125,7 @@ public abstract class AbstractHttpClient
      * @return HttpState
      * @throws IOException
      */
-    public abstract HttpState preProcessWebserviceCall( HttpMethod post )
+    protected abstract HttpState preProcessWebserviceCall( HttpMethod post )
         throws IOException;
 
     /**
@@ -140,53 +135,13 @@ public abstract class AbstractHttpClient
      * @param httpState state
      * @throws IOException
      */
-    public abstract void postProcessWebserviceCall( HttpMethod post, HttpState httpState )
+    protected abstract void postProcessWebserviceCall( HttpMethod post, HttpState httpState )
         throws IOException;
 
     /**
-     * @return Returns the httpClient.
-     */
-    private HttpClient getHttpClient()
-    {
-        return httpClient;
-    }
-
-    /**
-     * @param httpClient The httpClient to set.
-     */
-    private void setHttpClient( HttpClient httpClient )
-    {
-        this.httpClient = httpClient;
-    }
-
-    /**
-     * @return Returns the connectionManager.
-     */
-    public MultiThreadedHttpConnectionManager getConnectionManager()
-    {
-        return connectionManager;
-    }
-
-    /**
-     * @param connectionManager The connectionManager to set.
-     */
-    public void setConnectionManager( MultiThreadedHttpConnectionManager connectionManager )
-    {
-        this.connectionManager = connectionManager;
-    }
-
-    /**
-     * @param remoteHttpCacheAttributes the remoteHttpCacheAttributes to set
-     */
-    public void setRemoteHttpCacheAttributes( RemoteHttpCacheAttributes remoteHttpCacheAttributes )
-    {
-        this.remoteHttpCacheAttributes = remoteHttpCacheAttributes;
-    }
-
-    /**
      * @return the remoteHttpCacheAttributes
      */
-    public RemoteHttpCacheAttributes getRemoteHttpCacheAttributes()
+    protected RemoteHttpCacheAttributes getRemoteHttpCacheAttributes()
     {
         return remoteHttpCacheAttributes;
     }
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java
index f156fab..54ead3b 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java
@@ -1,5 +1,7 @@
 package org.apache.commons.jcs.auxiliary.remote.http.client;
 
+import java.io.IOException;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -26,8 +28,6 @@ import org.apache.commons.jcs.engine.behavior.ICacheServiceNonLocal;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.IOException;
-
 /**
  * This uses an http client as the service.
  */
@@ -37,6 +37,9 @@ public class RemoteHttpCache<K, V>
     /** The logger. */
     private static final Log log = LogFactory.getLog( RemoteHttpCache.class );
 
+    /** for error notifications */
+    private RemoteHttpCacheMonitor monitor;
+
     /** Keep the child copy here for the restore process. */
     private RemoteHttpCacheAttributes remoteHttpCacheAttributes;
 
@@ -49,13 +52,15 @@ public class RemoteHttpCache<K, V>
      * @param remoteHttpCacheAttributes
      * @param remote
      * @param listener
+     * @param monitor the cache monitor
      */
     public RemoteHttpCache( RemoteHttpCacheAttributes remoteHttpCacheAttributes, ICacheServiceNonLocal<K, V> remote,
-                            IRemoteCacheListener<K, V> listener )
+                            IRemoteCacheListener<K, V> listener, RemoteHttpCacheMonitor monitor )
     {
         super( remoteHttpCacheAttributes, remote, listener );
 
-        setRemoteHttpCacheAttributes( remoteHttpCacheAttributes );
+        this.remoteHttpCacheAttributes = remoteHttpCacheAttributes;
+        this.monitor = monitor;
     }
 
     /**
@@ -79,7 +84,7 @@ public class RemoteHttpCache<K, V>
 
             setRemoteCacheService( new ZombieCacheServiceNonLocal<K, V>( getRemoteCacheAttributes().getZombieQueueMaxSize() ) );
 
-            RemoteHttpCacheMonitor.getInstance().notifyError( this );
+            monitor.notifyError( this );
         }
 
         if ( ex instanceof IOException )
@@ -99,14 +104,6 @@ public class RemoteHttpCache<K, V>
     }
 
     /**
-     * @param remoteHttpCacheAttributes the remoteHttpCacheAttributes to set
-     */
-    public void setRemoteHttpCacheAttributes( RemoteHttpCacheAttributes remoteHttpCacheAttributes )
-    {
-        this.remoteHttpCacheAttributes = remoteHttpCacheAttributes;
-    }
-
-    /**
      * @return the remoteHttpCacheAttributes
      */
     public RemoteHttpCacheAttributes getRemoteHttpCacheAttributes()
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
index a31510a..a19ef51 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
@@ -41,6 +41,9 @@ public class RemoteHttpCacheDispatcher
     extends AbstractHttpClient
     implements IRemoteCacheDispatcher
 {
+    /** Parameter encoding */
+    private static final String DEFAULT_ENCODING = "UTF-8";
+
     /** Named of the parameter */
     private static final String PARAMETER_REQUEST_TYPE = "RequestType";
 
@@ -99,8 +102,7 @@ public class RemoteHttpCacheDispatcher
         }
         catch ( Exception e )
         {
-            log.error( "Problem dispatching request.", e );
-            throw new IOException( e.getMessage() );
+            throw new IOException("Problem dispatching request.", e);
         }
     }
 
@@ -147,7 +149,7 @@ public class RemoteHttpCacheDispatcher
                 if ( remoteCacheRequest.getCacheName() != null )
                 {
                     url.append( PARAMETER_CACHE_NAME + "="
-                        + URLEncoder.encode( remoteCacheRequest.getCacheName(), "UTF-8" ) );
+                        + URLEncoder.encode( remoteCacheRequest.getCacheName(), DEFAULT_ENCODING ) );
                 }
             }
             if ( getRemoteHttpCacheAttributes().isIncludeKeysAndPatternsAsParameter() )
@@ -172,7 +174,7 @@ public class RemoteHttpCacheDispatcher
                     default:
                         break;
                 }
-                String encodedKeyValue = URLEncoder.encode( keyValue, "UTF-8" );
+                String encodedKeyValue = URLEncoder.encode( keyValue, DEFAULT_ENCODING );
                 url.append( "&" + PARAMETER_KEY + "=" + encodedKeyValue );
             }
             if ( getRemoteHttpCacheAttributes().isIncludeRequestTypeasAsParameter() )
@@ -180,7 +182,7 @@ public class RemoteHttpCacheDispatcher
                 url.append( "&"
                     + PARAMETER_REQUEST_TYPE
                     + "="
-                    + URLEncoder.encode( remoteCacheRequest.getRequestType().toString(), "UTF-8" ) );
+                    + URLEncoder.encode( remoteCacheRequest.getRequestType().toString(), DEFAULT_ENCODING ) );
             }
         }
         catch ( UnsupportedEncodingException e )
@@ -204,7 +206,7 @@ public class RemoteHttpCacheDispatcher
      * @throws IOException
      */
     @Override
-    public HttpState preProcessWebserviceCall( HttpMethod post )
+    protected HttpState preProcessWebserviceCall( HttpMethod post )
         throws IOException
     {
         // do nothing. Child can override.
@@ -219,7 +221,7 @@ public class RemoteHttpCacheDispatcher
      * @throws IOException
      */
     @Override
-    public void postProcessWebserviceCall( HttpMethod post, HttpState httpState )
+    protected void postProcessWebserviceCall( HttpMethod post, HttpState httpState )
         throws IOException
     {
         // do nothing. Child can override.
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
index 6d5a577..67d243e 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
@@ -19,18 +19,19 @@ package org.apache.commons.jcs.auxiliary.remote.http.client;
  * under the License.
  */
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCacheFactory;
 import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
 import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheNoWaitFacade;
+import org.apache.commons.jcs.auxiliary.remote.RemoteCacheNoWait;
+import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheClient;
+import org.apache.commons.jcs.auxiliary.remote.http.client.behavior.IRemoteHttpCacheClient;
 import org.apache.commons.jcs.auxiliary.remote.server.behavior.RemoteType;
-import org.apache.commons.jcs.engine.behavior.ICache;
 import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
 import org.apache.commons.jcs.engine.behavior.IElementSerializer;
 import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
+import org.apache.commons.jcs.utils.config.OptionConverter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * The RemoteCacheFactory creates remote caches for the cache hub. It returns a no wait facade which
@@ -41,9 +42,11 @@ import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
 public class RemoteHttpCacheFactory
     extends AbstractAuxiliaryCacheFactory
 {
-    /** store reference of facades to initiate failover */
-    private static final HashMap<String, RemoteCacheNoWaitFacade<?, ?>> facades =
-        new HashMap<String, RemoteCacheNoWaitFacade<?, ?>>();
+    /** The logger */
+    private static final Log log = LogFactory.getLog( RemoteHttpCacheFactory.class );
+
+    /** Monitor thread instance */
+    private RemoteHttpCacheMonitor monitor;
 
     /**
      * For LOCAL clients we get a handle to all the failovers, but we do not register a listener
@@ -64,28 +67,82 @@ public class RemoteHttpCacheFactory
     {
         RemoteHttpCacheAttributes rca = (RemoteHttpCacheAttributes) iaca;
 
-        ArrayList<ICache<K, V>> noWaits = new ArrayList<ICache<K, V>>();
-
-        RemoteHttpCacheManager rcm = RemoteHttpCacheManager.getInstance( cacheMgr, cacheEventLogger, elementSerializer );
         // TODO, use the configured value.
         rca.setRemoteType( RemoteType.LOCAL );
-        ICache<K, V> ic = rcm.getCache( rca );
-        noWaits.add( ic );
 
-        RemoteCacheNoWaitFacade<K, V> rcnwf =
-            new RemoteCacheNoWaitFacade<K, V>(noWaits, rca, cacheMgr, cacheEventLogger, elementSerializer );
+        RemoteHttpClientListener<K, V> listener = new RemoteHttpClientListener<K, V>( rca, cacheMgr, elementSerializer );
 
-        getFacades().put( rca.getCacheName(), rcnwf );
+        IRemoteHttpCacheClient<K, V> remoteService = createRemoteHttpCacheClientForAttributes(rca);
 
-        return rcnwf;
+        IRemoteCacheClient<K, V> remoteCacheClient =
+                new RemoteHttpCache<K, V>( rca, remoteService, listener, monitor );
+        remoteCacheClient.setCacheEventLogger( cacheEventLogger );
+        remoteCacheClient.setElementSerializer( elementSerializer );
+
+        RemoteCacheNoWait<K, V> remoteCacheNoWait = new RemoteCacheNoWait<K, V>( remoteCacheClient );
+        remoteCacheNoWait.setCacheEventLogger( cacheEventLogger );
+        remoteCacheNoWait.setElementSerializer( elementSerializer );
+
+        return remoteCacheNoWait;
     }
 
     /**
-     * The facades are what the cache hub talks to.
-     * @return Returns the facades.
+     * This is an extension point. The manager and other classes will only create
+     * RemoteHttpCacheClient through this method.
+
+     * @param cattr the cache configuration
+     * @return the client instance
      */
-    public static HashMap<String, RemoteCacheNoWaitFacade<?, ?>> getFacades()
+    protected <V, K> IRemoteHttpCacheClient<K, V> createRemoteHttpCacheClientForAttributes(RemoteHttpCacheAttributes cattr)
     {
-        return facades;
+        IRemoteHttpCacheClient<K, V> remoteService = OptionConverter.instantiateByClassName( cattr
+                        .getRemoteHttpClientClassName(), null );
+
+        if ( remoteService == null )
+        {
+            if ( log.isInfoEnabled() )
+            {
+                log.info( "Creating the default client for " + cattr.getCacheName());
+            }
+            remoteService = new RemoteHttpCacheClient<K, V>( );
+        }
+
+        remoteService.initialize( cattr );
+        return remoteService;
+    }
+
+    /**
+     * @see org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCacheFactory#initialize()
+     */
+    @Override
+    public void initialize()
+    {
+        super.initialize();
+        monitor = new RemoteHttpCacheMonitor(this);
+        monitor.setDaemon(true);
+        monitor.start();
+    }
+
+    /**
+     * @see org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCacheFactory#dispose()
+     */
+    @Override
+    public void dispose()
+    {
+        if (monitor != null)
+        {
+            monitor.notifyShutdown();
+            try
+            {
+                monitor.join(5000);
+            }
+            catch (InterruptedException e)
+            {
+                // swallow
+            }
+            monitor = null;
+        }
+
+        super.dispose();
     }
 }
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java
deleted file mode 100644
index b54b954..0000000
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package org.apache.commons.jcs.auxiliary.remote.http.client;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheNoWait;
-import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
-import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheClient;
-import org.apache.commons.jcs.auxiliary.remote.http.client.behavior.IRemoteHttpCacheClient;
-import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
-import org.apache.commons.jcs.engine.behavior.IElementSerializer;
-import org.apache.commons.jcs.engine.behavior.IShutdownObserver;
-import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
-import org.apache.commons.jcs.utils.config.OptionConverter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * This is a very crude copy of the RMI remote manager. It needs a lot of work!
- */
-public class RemoteHttpCacheManager
-    implements IShutdownObserver
-{
-    /** The logger */
-    private static final Log log = LogFactory.getLog( RemoteHttpCacheManager.class );
-
-    /** Contains mappings of Location instance to RemoteCacheManager instance. */
-    private static RemoteHttpCacheManager instance;
-
-    /** Contains instances of RemoteCacheNoWait managed by a RemoteCacheManager instance. */
-    static final Map<String, RemoteCacheNoWait<?, ?>> caches =
-        new HashMap<String, RemoteCacheNoWait<?, ?>>();
-
-    /** The configuration attributes. */
-    private IRemoteCacheAttributes remoteCacheAttributes;
-
-    /** The event logger. */
-    private final ICacheEventLogger cacheEventLogger;
-
-    /** The serializer. */
-    private final IElementSerializer elementSerializer;
-
-    /** The cache manager listeners will need to use to get a cache. */
-    private final ICompositeCacheManager cacheMgr;
-
-    /** Remote cache monitor. */
-    private static RemoteHttpCacheMonitor monitor;
-
-    /**
-     * Constructs an instance to with the given remote connection parameters. If the connection
-     * cannot be made, "zombie" services will be temporarily used until a successful re-connection
-     * is made by the monitoring daemon.
-     * <p>
-     * @param cacheMgr
-     * @param cacheEventLogger
-     * @param elementSerializer
-     */
-    private RemoteHttpCacheManager( ICompositeCacheManager cacheMgr, ICacheEventLogger cacheEventLogger,
-                                    IElementSerializer elementSerializer )
-    {
-        this.cacheMgr = cacheMgr;
-        this.cacheEventLogger = cacheEventLogger;
-        this.elementSerializer = elementSerializer;
-
-        // register shutdown observer
-        this.cacheMgr.registerShutdownObserver( this );
-    }
-
-    /**
-     * Gets the defaultCattr attribute of the RemoteCacheManager object.
-     * <p>
-     * @return The defaultCattr value
-     */
-    public IRemoteCacheAttributes getDefaultCattr()
-    {
-        return this.remoteCacheAttributes;
-    }
-
-    /** @return Returns an instance if it exists. else null. */
-    public synchronized static RemoteHttpCacheManager getInstance()
-    {
-        return instance;
-    }
-
-    /**
-     * Get the singleton instance.
-     * <p>
-     * @param cacheMgr
-     * @param cacheEventLogger
-     * @param elementSerializer
-     * @return The instance value
-     */
-    public synchronized static RemoteHttpCacheManager getInstance( ICompositeCacheManager cacheMgr,
-                                                                   ICacheEventLogger cacheEventLogger,
-                                                                   IElementSerializer elementSerializer )
-    {
-        if ( instance == null )
-        {
-            instance = new RemoteHttpCacheManager( cacheMgr, cacheEventLogger, elementSerializer );
-        }
-
-        // Fires up the monitoring daemon.
-        if ( monitor == null )
-        {
-            monitor = RemoteHttpCacheMonitor.getInstance();
-            // If the returned monitor is null, it means it's already started
-            // elsewhere.
-            if ( monitor != null )
-            {
-                Thread t = new Thread( monitor );
-                t.setDaemon( true );
-                t.start();
-            }
-        }
-
-        return instance;
-    }
-
-    /**
-     * Returns a remote cache for the given cache name.
-     * <p>
-     * @param cacheName
-     * @return The cache value
-     */
-    // @Override
-    public <K, V> RemoteCacheNoWait<K, V> getCache( String cacheName )
-    {
-        // TODO get some defaults!
-        // Perhaps we will need a manager per URL????
-        RemoteHttpCacheAttributes ca = new RemoteHttpCacheAttributes();
-        ca.setCacheName( cacheName );
-        return getCache( ca );
-    }
-
-    /**
-     * Gets a RemoteCacheNoWait from the RemoteCacheManager. The RemoteCacheNoWait objects are
-     * identified by the cache name value of the RemoteCacheAttributes object.
-     * <p>
-     * If the client is configured to register a listener, this call results on a listener being
-     * created if one isn't already registered with the remote cache for this region.
-     * <p>
-     * @param cattr
-     * @return The cache value
-     */
-    public <K, V> RemoteCacheNoWait<K, V> getCache( RemoteHttpCacheAttributes cattr )
-    {
-        RemoteCacheNoWait<K, V> remoteCacheNoWait = null;
-
-        synchronized ( caches )
-        {
-            @SuppressWarnings("unchecked") // Need to cast because of common map for all caches
-            RemoteCacheNoWait<K, V> remoteCacheNoWait2 = (RemoteCacheNoWait<K, V>) caches.get( cattr.getCacheName() + cattr.getUrl() );
-            remoteCacheNoWait = remoteCacheNoWait2;
-            if ( remoteCacheNoWait == null )
-            {
-                RemoteHttpClientListener<K, V> listener = new RemoteHttpClientListener<K, V>( cattr, cacheMgr, elementSerializer );
-
-                IRemoteHttpCacheClient<K, V> remoteService = createRemoteHttpCacheClientForAttributes( cattr );
-
-                IRemoteCacheClient<K, V> remoteCacheClient = new RemoteHttpCache<K, V>( cattr, remoteService, listener );
-                remoteCacheClient.setCacheEventLogger( cacheEventLogger );
-                remoteCacheClient.setElementSerializer( elementSerializer );
-
-                remoteCacheNoWait = new RemoteCacheNoWait<K, V>( remoteCacheClient );
-                remoteCacheNoWait.setCacheEventLogger( cacheEventLogger );
-                remoteCacheNoWait.setElementSerializer( elementSerializer );
-
-                caches.put( cattr.getCacheName() + cattr.getUrl(), remoteCacheNoWait );
-            }
-            // might want to do some listener sanity checking here.
-        }
-
-        return remoteCacheNoWait;
-    }
-
-    /**
-     * This is an extension point. The manager and other classes will only create
-     * RemoteHttpCacheClient through this method.
-     * <p>
-     * @param cattr
-     * @return IRemoteHttpCacheClient
-     */
-    protected <K, V> IRemoteHttpCacheClient<K, V> createRemoteHttpCacheClientForAttributes( RemoteHttpCacheAttributes cattr )
-    {
-        IRemoteHttpCacheClient<K, V> client = OptionConverter.instantiateByClassName( cattr
-            .getRemoteHttpClientClassName(), null );
-
-        if ( client == null )
-        {
-            if ( log.isInfoEnabled() )
-            {
-                log.info( "Creating the default client." );
-            }
-            client = new RemoteHttpCacheClient<K, V>( );
-        }
-        client.initialize( cattr );
-        return client;
-    }
-
-    /**
-     * Gets the stats attribute of the RemoteCacheManager object
-     * <p>
-     * @return The stats value
-     */
-    public String getStats()
-    {
-        StringBuilder stats = new StringBuilder();
-        for (RemoteCacheNoWait<?, ?> c : caches.values())
-        {
-            if ( c != null )
-            {
-                stats.append( c.getCacheName() );
-            }
-        }
-        return stats.toString();
-    }
-
-    /**
-     * Shutdown callback from composite cache manager.
-     * <p>
-     * @see org.apache.commons.jcs.engine.behavior.IShutdownObserver#shutdown()
-     */
-    @Override
-    public void shutdown()
-    {
-        if ( log.isInfoEnabled() )
-        {
-            log.info( "Observed shutdown request." );
-        }
-        //release();
-    }
-
-    /**
-     * Logs an event if an event logger is configured.
-     * <p>
-     * @param source
-     * @param eventName
-     * @param optionalDetails
-     */
-    protected void logApplicationEvent( String source, String eventName, String optionalDetails )
-    {
-        if ( cacheEventLogger != null )
-        {
-            cacheEventLogger.logApplicationEvent( source, eventName, optionalDetails );
-        }
-    }
-}
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
index 77c1fe1..feb1210 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
@@ -34,35 +34,23 @@ import org.apache.commons.jcs.engine.CacheStatus;
  */
 public class RemoteHttpCacheMonitor extends AbstractAuxiliaryCacheMonitor
 {
-    /** The remote cache that we are monitoring */
-    private static RemoteHttpCacheMonitor instance;
-
     /** Set of remote caches to monitor. This are added on error, if not before. */
-    private final ConcurrentHashMap<RemoteHttpCache<?, ?>, RemoteHttpCache<?, ?>> remoteHttpCaches =
-        new ConcurrentHashMap<RemoteHttpCache<?, ?>, RemoteHttpCache<?, ?>>();
+    private final ConcurrentHashMap<RemoteHttpCache<?, ?>, RemoteHttpCache<?, ?>> remoteHttpCaches;
 
-    /** Constructor for the RemoteCacheMonitor object */
-    private RemoteHttpCacheMonitor()
-    {
-        super("JCS-RemoteHttpCacheMonitor");
-        setIdlePeriod(3000L);
-    }
+    /** Factory instance */
+    private RemoteHttpCacheFactory factory = null;
 
     /**
-     * Returns the singleton instance.
-     * <p>
-     * @return The instance value
+     * Constructor for the RemoteCacheMonitor object
+     *
+     * @param factory the factory to set
      */
-    public static RemoteHttpCacheMonitor getInstance()
+    public RemoteHttpCacheMonitor(RemoteHttpCacheFactory factory)
     {
-        synchronized ( RemoteHttpCacheMonitor.class )
-        {
-            if ( instance == null )
-            {
-                return instance = new RemoteHttpCacheMonitor();
-            }
-        }
-        return instance;
+        super("JCS-RemoteHttpCacheMonitor");
+        this.factory = factory;
+        this.remoteHttpCaches = new ConcurrentHashMap<RemoteHttpCache<?, ?>, RemoteHttpCache<?, ?>>();
+        setIdlePeriod(3000L);
     }
 
     /**
@@ -94,13 +82,18 @@ public class RemoteHttpCacheMonitor extends AbstractAuxiliaryCacheMonitor
     // performance reasons.
     // If exception is thrown owing to synchronization,
     // just skip the monitoring until the next round.
-    /** Main processing method for the RemoteCacheMonitor object */
+    /** Main processing method for the RemoteHttpCacheMonitor object */
     @Override
-    public void doWork()
+    protected void doWork()
     {
+        // If no factory has been set, skip
+        if (factory == null)
+        {
+            return;
+        }
+
         // If any cache is in error, it strongly suggests all caches
-        // managed by the
-        // same RmicCacheManager instance are in error. So we fix
+        // managed by the same RmicCacheManager instance are in error. So we fix
         // them once and for all.
         for (RemoteHttpCache<?, ?> remoteCache : this.remoteHttpCaches.values())
         {
@@ -110,8 +103,8 @@ public class RemoteHttpCacheMonitor extends AbstractAuxiliaryCacheMonitor
                 {
                     RemoteHttpCacheAttributes attributes = remoteCache.getRemoteHttpCacheAttributes();
 
-                    IRemoteHttpCacheClient<Serializable, Serializable> remoteService = RemoteHttpCacheManager.getInstance()
-                        .createRemoteHttpCacheClientForAttributes( attributes );
+                    IRemoteHttpCacheClient<Serializable, Serializable> remoteService =
+                            factory.createRemoteHttpCacheClientForAttributes( attributes );
 
                     if ( log.isInfoEnabled() )
                     {
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java b/src/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
index bb3fa8f..9644591 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
@@ -56,7 +56,7 @@ public class RemoteCacheServerFactory
     private static final Log log = LogFactory.getLog( RemoteCacheServerFactory.class );
 
     /** The single instance of the RemoteCacheServer object. */
-    private static RemoteCacheServer<? extends Serializable, ? extends Serializable> remoteCacheServer;
+    private static RemoteCacheServer<?, ?> remoteCacheServer;
 
     /** The name of the service. */
     private static String serviceName = IRemoteCacheConstants.REMOTE_CACHE_SERVICE_VAL;
diff --git a/src/org/apache/commons/jcs/utils/struct/SingleLinkedList.java b/src/org/apache/commons/jcs/utils/struct/SingleLinkedList.java
deleted file mode 100644
index 0e0f5f3..0000000
--- a/src/org/apache/commons/jcs/utils/struct/SingleLinkedList.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.apache.commons.jcs.utils.struct;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * This is an basic thread safe single linked list. It provides very limited functionality. It is
- * small and fast.
- * <p>
- * @author Aaron Smuts
- */
-public class SingleLinkedList<T>
-{
-    /** The logger */
-    private static final Log log = LogFactory.getLog( SingleLinkedList.class );
-
-    /** for sync */
-    private final Object lock = new Object();
-
-    /** the head of the queue */
-    private Node<T> head = new Node<T>();
-
-    /** the end of the queue */
-    private Node<T> tail = head;
-
-    /** The size of the list */
-    private int size = 0;
-
-    /**
-     * Takes the first item off the list.
-     * <p>
-     * @return null if the list is empty.
-     */
-    public T takeFirst()
-    {
-        synchronized ( lock )
-        {
-            // wait until there is something to read
-            if ( head == tail )
-            {
-                return null;
-            }
-
-            Node<T> node = head.next;
-
-            T value = node.payload;
-
-            if ( log.isDebugEnabled() )
-            {
-                log.debug( "head.payload = " + head.payload );
-                log.debug( "node.payload = " + node.payload );
-            }
-
-            // Node becomes the new head (head is always empty)
-
-            node.payload = null;
-            head = node;
-
-            size--;
-            return value;
-        }
-    }
-
-    /**
-     * Adds an item to the end of the list.
-     * <p>
-     * @param payload
-     */
-    public void addLast( T payload )
-    {
-        Node<T> newNode = new Node<T>();
-
-        newNode.payload = payload;
-
-        synchronized ( lock )
-        {
-            size++;
-            tail.next = newNode;
-            tail = newNode;
-        }
-    }
-
-    /**
-     * Removes everything.
-     */
-    public void clear()
-    {
-        synchronized ( lock )
-        {
-            head = tail;
-            size = 0;
-        }
-    }
-
-    /**
-     * The list is composed of nodes.
-     * <p>
-     * @author Aaron Smuts
-     */
-    protected static class Node<T>
-    {
-        /** next in the list */
-        Node<T> next = null;
-
-        /** The data in this node */
-        T payload;
-    }
-
-    /**
-     * Returns the number of elements in the list.
-     * <p>
-     * @return number of items in the list.
-     */
-    public int size()
-    {
-        return size;
-    }
-}
diff --git a/src/org/apache/commons/jcs/utils/struct/SortedPreferentialArray.java b/src/org/apache/commons/jcs/utils/struct/SortedPreferentialArray.java
deleted file mode 100644
index 165cf29..0000000
--- a/src/org/apache/commons/jcs/utils/struct/SortedPreferentialArray.java
+++ /dev/null
@@ -1,612 +0,0 @@
-package org.apache.commons.jcs.utils.struct;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * This maintains a sorted array with a preferential replacement policy when full.
- * <p>
- * Insertion time is n, search is log(n)
- * <p>
- * Clients must manage thread safety on previous version. I synchronized the public methods to add
- * easy thread safety. I synchronized all public methods that make modifications.
- */
-public class SortedPreferentialArray<T extends Comparable<? super T>>
-{
-    /** The logger */
-    private static final Log log = LogFactory.getLog( SortedPreferentialArray.class );
-
-    /** prefer large means that the smallest will be removed when full. */
-    private boolean preferLarge = true;
-
-    /** maximum number allowed */
-    private int maxSize = 0;
-
-    /** The currency number */
-    private int curSize = 0;
-
-    /** The primary array */
-    private final T[] array;
-
-    /** the number that have been inserted. */
-    private int insertCnt = 0;
-
-    /**
-     * Construct the array with the maximum size.
-     * <p>
-     * @param maxSize int
-     */
-    public SortedPreferentialArray( int maxSize )
-    {
-        this.maxSize = maxSize;
-        @SuppressWarnings("unchecked") // No generic arrays in java
-        T[] ts = (T[]) new Comparable<?>[maxSize];
-        array = ts;
-    }
-
-    /**
-     * If the array is full this will remove the smallest if preferLarge==true and if obj is bigger,
-     * or the largest if preferLarge=false and obj is smaller than the largest.
-     * <p>
-     * @param obj Object
-     */
-    public synchronized void add(T obj)
-    {
-        if ( obj == null )
-        {
-            return;
-        }
-
-        if ( curSize < maxSize )
-        {
-            insert( obj );
-            return;
-        }
-        if ( preferLarge )
-        {
-            // insert if obj is larger than the smallest
-            T sma = getSmallest();
-            if ( obj.compareTo( sma ) > 0 )
-            {
-                insert( obj );
-                return;
-            }
-            // obj is less than or equal to the smallest.
-            if ( log.isDebugEnabled() )
-            {
-                log.debug( "New object is smaller than or equal to the smallest" );
-            }
-            return;
-        }
-        // Not preferLarge
-        T lar = getLargest();
-        // insert if obj is smaller than the largest
-        int diff = obj.compareTo( lar );
-        if ( diff > 0 || diff == 0 )
-        {
-            if ( log.isDebugEnabled() )
-            {
-                log.debug( "New object is larger than or equal to the largest" );
-            }
-            return;
-        }
-        // obj is less than the largest.
-        insert( obj );
-    }
-
-    /**
-     * Returns the largest without removing it from the array.
-     * <p>
-     * @return Comparable
-     */
-    public synchronized T getLargest()
-    {
-        return array[curSize - 1];
-    }
-
-    /**
-     * Returns the smallest element without removing it from the array.
-     * <p>
-     * @return Comparable
-     */
-    public synchronized T getSmallest()
-    {
-        return array[0];
-    }
-
-    /**
-     * Insert looks for the nearest largest. It then determines which way to shuffle depending on
-     * the preference.
-     * <p>
-     * @param obj Comparable
-     */
-    private void insert(T obj)
-    {
-        try
-        {
-            int nLar = findNearestLargerEqualOrLastPosition( obj );
-            if ( log.isDebugEnabled() )
-            {
-                log.debug( "nLar = " + nLar + " obj = " + obj );
-            }
-
-            if ( nLar == curSize )
-            {
-                // this next check should be unnecessary
-                // findNearestLargerPosition should only return the curSize if
-                // there is
-                // room left. Check to be safe
-                if ( curSize < maxSize )
-                {
-                    array[nLar] = obj;
-                    curSize++;
-                    if ( log.isDebugEnabled() )
-                    {
-                        log.debug( this.dumpArray() );
-                    }
-                    if ( log.isDebugEnabled() )
-                    {
-                        log.debug( "Inserted object at the end of the array" );
-                    }
-                    return;
-                } // end if not full
-            }
-
-            boolean isFull = false;
-            if ( curSize == maxSize )
-            {
-                isFull = true;
-            }
-
-            // The array is full, we must replace
-            // remove smallest or largest to determine whether to
-            // shuffle left or right to insert
-            if ( preferLarge )
-            {
-                if ( isFull )
-                {
-                    // is full, prefer larger, remove smallest by shifting left
-                    int pnt = nLar - 1; // set iteration stop point
-                    for ( int i = 0; i < pnt; i++ )
-                    {
-                        array[i] = array[i + 1];
-                    }
-                    // use nLar-1 for insertion point
-                    array[nLar - 1] = obj;
-                    if ( log.isDebugEnabled() )
-                    {
-                        log.debug( "Inserted object at " + ( nLar - 1 ) );
-                    }
-                }
-                else
-                {
-                    // not full, shift right from spot
-                    int pnt = nLar; // set iteration stop point
-                    for ( int i = curSize; i > pnt; i-- )
-                    {
-                        array[i] = array[i - 1];
-                    }
-                    // use nLar-1 for insertion point
-                    array[nLar] = obj;
-                    curSize++;
-                    if ( log.isDebugEnabled() )
-                    {
-                        log.debug( "Inserted object at " + ( nLar ) );
-                    }
-                }
-            }
-            else
-            {
-                // prefer smaller, remove largest by shifting right
-                // use nLar for insertion point
-                int pnt = nLar + 1;
-                if ( !isFull )
-                {
-                    pnt = nLar;
-                }
-                for ( int i = curSize; i > pnt; i-- )
-                {
-                    array[i] = array[i - 1];
-                }
-                array[nLar] = obj;
-                if ( log.isDebugEnabled() )
-                {
-                    log.debug( "Inserted object at " + nLar );
-                }
-            }
-
-            if ( log.isDebugEnabled() )
-            {
-                log.debug( this.dumpArray() );
-            }
-        }
-        catch ( Exception e )
-        {
-            log.error( "Insertion problem" + this.dumpArray(), e );
-        }
-
-        insertCnt++;
-        if ( insertCnt % 100 == 0 )
-        {
-            if ( log.isDebugEnabled() )
-            {
-                log.debug( this.dumpArray() );
-            }
-        }
-    }
-
-    /**
-     * Determines whether the preference is for large or small.
-     * <p>
-     * @param pref boolean
-     */
-    public synchronized void setPreferLarge( boolean pref )
-    {
-        preferLarge = pref;
-    }
-
-    /**
-     * Returns and removes the nearer larger or equal object from the aray.
-     * <p>
-     * @param obj Comparable
-     * @return Comparable, null if arg is null or none was found.
-     */
-    public synchronized T takeNearestLargerOrEqual( T obj )
-    {
-        if ( obj == null )
-        {
-            return null;
-        }
-
-        T retVal = null;
-        try
-        {
-            int pos = findNearestOccupiedLargerOrEqualPosition( obj );
-            if ( pos == -1 )
-            {
-                return null;
-            }
-
-            try
-            {
-                retVal = array[pos];
-                remove( pos );
-            }
-            catch ( Exception e )
-            {
-                log.error( "Problem removing from array. pos [" + pos + "] " + obj, e );
-            }
-
-            if ( log.isDebugEnabled() )
-            {
-                log.debug( "obj = " + obj + " || retVal = " + retVal );
-            }
-        }
-        catch ( Exception e )
-        {
-            log.error( "Take problem" + this.dumpArray(), e );
-        }
-        return retVal;
-    }
-
-    /**
-     * Returns the current size of the array.
-     * <p>
-     * @return int
-     */
-    public synchronized int size()
-    {
-        return this.curSize;
-    }
-
-    /**
-     * This determines the position in the array that is occupied by an object that is larger or
-     * equal to the argument. If none exists, -1 is returned.
-     * <p>
-     * @param obj Object
-     * @return Object
-     */
-    private int findNearestOccupiedLargerOrEqualPosition(T obj)
-    {
-        if ( curSize == 0 )
-        {
-            // nothing in the array
-            return -1;
-        }
-
-        // this gives us an insert position.
-        int pos = findNearestLargerEqualOrLastPosition( obj );
-
-        // see if the previous will do to handle the empty insert spot position
-        if ( pos == curSize )
-        { // && curSize < maxSize ) {
-            // pos will be > 0 if it equals curSize, we check for this above.
-            if ( obj.compareTo(array[pos - 1] ) <= 0 )
-            {
-                pos = pos - 1;
-            }
-            else
-            {
-                pos = -1;
-            }
-        }
-        else
-        {
-            // the find nearest, returns the last, since it is used by insertion.
-            if ( obj.compareTo(array[pos] ) > 0 )
-            {
-                return -1;
-            }
-        }
-
-        return pos;
-    }
-
-    /**
-     * This method determines the position where an insert should take place for a given object.
-     * With some additional checking, this can also be used to find an object matching or greater
-     * than the argument.
-     * <p>
-     * If the array is not full and the current object is larger than all the rest the first open
-     * slot at the end will be returned.
-     * <p>
-     * NOTE: If the object is larger than the largest and it is full, it will return the last position.
-     * <p>
-     * If the array is empty, the first spot is returned.
-     * <p>
-     * If the object is smaller than all the rests, the first position is returned. The caller must
-     * decide what to do given the preference.
-     * <p>
-     * Returns the position of the object nearest to or equal to the larger object.
-     * <p>
-     * If you want to find the takePosition, you have to calculate it.
-     * findNearestOccupiedLargerOrEqualPosition will calculate this for you.
-     * <p>
-     * @param obj Comparable
-     * @return int
-     */
-    private int findNearestLargerEqualOrLastPosition(T obj)
-    {
-        // do nothing if a null was passed in
-        if ( obj == null )
-        {
-            return -1;
-        }
-
-        // return the first spot if the array is empty
-        if ( curSize <= 0 )
-        {
-            return 0;
-        }
-
-        // mark the numer to be returned, the greaterPos as unset
-        int greaterPos = -1;
-        // prepare for a binary search
-        int curPos = ( curSize - 1 ) / 2;
-        int prevPos = -1;
-
-        try
-        {
-            // set the loop exit flag to false
-            boolean done = false;
-
-            // check the ends
-            // return insert position 0 if obj is smaller
-            // than the smallest. the caller can determine what to
-            // do with this, depending on the preference setting
-            if ( obj.compareTo( getSmallest() ) <= 0 )
-            {
-                // LESS THAN OR EQUAL TO SMALLEST
-                if ( log.isDebugEnabled() )
-                {
-                    log.debug( obj + " is smaller than or equal to " + getSmallest() );
-                }
-                greaterPos = 0;
-                done = true;
-                // return greaterPos;
-            }
-            else
-            {
-                // GREATER THAN SMALLEST
-                if ( log.isDebugEnabled() )
-                {
-                    log.debug( obj + " is bigger than " + getSmallest() );
-                }
-
-                // return the largest position if obj is larger
-                // than the largest. the caller can determine what to
-                // do with this, depending on the preference setting
-                if ( obj.compareTo( getLargest() ) >= 0 )
-                {
-                    if ( curSize == maxSize )
-                    {
-                        // there is no room left in the array, return the last
-                        // spot
-                        greaterPos = curSize - 1;
-                        done = true;
-                    }
-                    else
-                    {
-                        // there is room left in the array
-                        greaterPos = curSize;
-                        done = true;
-                    }
-                }
-                else
-                {
-                    // the obj is less than or equal to the largest, so we know that the
-                    // last item is larger or equal
-                    greaterPos = curSize - 1;
-                }
-            }
-
-            // /////////////////////////////////////////////////////////////////////
-            // begin binary search for insertion spot
-            while ( !done )
-            {
-                if ( log.isDebugEnabled() )
-                {
-                    log.debug( "\n curPos = " + curPos + "; greaterPos = " + greaterPos + "; prevpos = " + prevPos );
-                }
-
-                // get out of loop if we have come to the end or passed it
-                if ( curPos == prevPos || curPos >= curSize )
-                {
-                    done = true;
-                    break;
-                }
-                else
-
-                // EQUAL TO
-                // object at current position is equal to the obj, use this,
-                // TODO could avoid some shuffling if I found a lower pos.
-                if (array[curPos].compareTo( obj ) == 0 )
-                {
-                    if ( log.isDebugEnabled() )
-                    {
-                        log.debug( array[curPos] + " is equal to " + obj );
-                    }
-                    greaterPos = curPos;
-                    done = true;
-                    break;
-                }
-                else
-
-                // GREATER THAN
-                // array object at current position is greater than the obj, go
-                // left
-                if (array[curPos].compareTo( obj ) > 0 )
-                {
-                    if ( log.isDebugEnabled() )
-                    {
-                        log.debug( array[curPos] + " is greater than " + obj );
-                    }
-                    // set the smallest greater equal to the current position
-                    greaterPos = curPos;
-                    // set the current position to
-                    // set the previous position to the current position
-                    // We could have an integer overflow, but this array could
-                    // never get that large.
-                    int newPos = Math.min( curPos, ( curPos + prevPos ) / 2 );
-                    prevPos = curPos;
-                    curPos = newPos;
-                }
-                else
-
-                // LESS THAN
-                // the object at the current position is smaller, go right
-                if (array[curPos].compareTo( obj ) < 0 )
-                {
-                    if ( log.isDebugEnabled() )
-                    {
-                        log.debug( array[curPos] + " is less than " + obj );
-                    }
-                    if ( ( greaterPos != -1 ) && greaterPos - curPos < 0 )
-                    {
-                        done = true;
-                        break; // return greaterPos;
-                    }
-                    else
-                    {
-                        int newPos = 0;
-                        if ( prevPos > curPos )
-                        {
-                            newPos = Math.min( ( curPos + prevPos ) / 2, curSize );
-                        }
-                        else if ( prevPos == -1 )
-                        {
-                            newPos = Math.min( ( curSize + curPos ) / 2, curSize );
-                        }
-                        prevPos = curPos;
-                        curPos = newPos;
-                    }
-                }
-            } // end while
-            // /////////////////////////////////////////////////////////////////////
-
-            if ( log.isDebugEnabled() )
-            {
-                log.debug( "Greater Position is [" + greaterPos + "]" + " array[greaterPos] [" + array[greaterPos]
-                    + "]" );
-            }
-        }
-        catch ( Exception e )
-        {
-            log.error( "\n curPos = " + curPos + "; greaterPos = " + greaterPos + "; prevpos = " + prevPos + " "
-                + this.dumpArray(), e );
-        }
-
-        return greaterPos;
-    }
-
-    /**
-     * Removes the item from the array at the specified position. The remaining items to the right
-     * are shifted left.
-     * <p>
-     * @param position int
-     * @throw IndexOutOfBoundsException if position is out of range.
-     */
-    private void remove( int position )
-    {
-        if ( position >= curSize || position < 0 )
-        {
-            throw new IndexOutOfBoundsException( "position=" + position + " must be less than curSize=" + curSize );
-        }
-        curSize--;
-
-        if ( position < curSize )
-        {
-            try
-            {
-                System.arraycopy( array, position + 1, array, position, ( curSize - position ) );
-            }
-            catch ( IndexOutOfBoundsException ibe )
-            {
-                // throw this, log details for debugging. This shouldn't happen.
-                log.warn( "Caught index out of bounds exception. "
-                    + "called 'System.arraycopy( array, position + 1, array, position, (curSize - position) );'  "
-                    + "array.lengh [" + array.length + "] position [" + position + "] curSize [" + curSize + "]" );
-                throw ibe;
-            }
-        }
-    }
-
-    /**
-     * Debugging method to return a human readable display of array data.
-     * <p>
-     * @return String representation of the contents.
-     */
-    protected synchronized String dumpArray()
-    {
-        StringBuilder buf = new StringBuilder();
-        buf.append( "\n ---------------------------" );
-        buf.append( "\n curSize = " + curSize );
-        buf.append( "\n array.length = " + array.length );
-        buf.append( "\n ---------------------------" );
-        buf.append( "\n Dump:" );
-        for ( int i = 0; i < curSize; i++ )
-        {
-            buf.append( "\n " + i + "=" + array[i] );
-        }
-        return buf.toString();
-    }
-}
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 4284b17..c415c91 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.awt.Window;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
@@ -68,7 +69,6 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.data.validation.OsmValidator;
-import org.openstreetmap.josm.gui.GettingStarted;
 import org.openstreetmap.josm.gui.MainFrame;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MainPanel;
@@ -77,11 +77,10 @@ import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.ProgramArguments;
 import org.openstreetmap.josm.gui.ProgramArguments.Option;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
-import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
+import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
@@ -103,6 +102,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
+import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
 import org.openstreetmap.josm.tools.PlatformHook;
 import org.openstreetmap.josm.tools.PlatformHookOsx;
 import org.openstreetmap.josm.tools.PlatformHookUnixoid;
@@ -168,7 +168,7 @@ public abstract class Main {
     public static final Preferences pref = new Preferences();
 
     /**
-     * The MapFrame. Use {@link Main#setMapFrame} to set or clear it.
+     * The MapFrame.
      * <p>
      * There should be no need to access this to access any map data. Use {@link #layerManager} instead.
      *
@@ -207,13 +207,6 @@ public abstract class Main {
      */
     public static final FileWatcher fileWatcher = new FileWatcher();
 
-    /**
-     * The MOTD Layer.
-     * @deprecated Do not access this. It will be removed soon. You should not need to access the GettingStarted panel.
-     */
-    @Deprecated
-    public final GettingStarted gettingStarted = mainPanel.getGettingStarted();
-
     protected static final Map<String, Throwable> NETWORK_ERRORS = new HashMap<>();
 
     private static final Set<OnlineResource> OFFLINE_RESOURCES = EnumSet.noneOf(OnlineResource.class);
@@ -467,33 +460,6 @@ public abstract class Main {
      */
     public static volatile PlatformHook platform;
 
-    /**
-     * Set or clear (if passed <code>null</code>) the map.
-     * <p>
-     * To be removed any time
-     * @param map The map to set {@link Main#map} to. Can be null.
-     * @deprecated This is done automatically by {@link MainPanel}
-     */
-    @Deprecated
-    public final void setMapFrame(final MapFrame map) {
-        Main.warn("setMapFrame call was ignored.");
-    }
-
-    /**
-     * Remove the specified layer from the map. If it is the last layer,
-     * remove the map as well.
-     * <p>
-     * To be removed end of 2016
-     * @param layer The layer to remove
-     * @deprecated You can remove the layer using {@link #getLayerManager()}
-     */
-    @Deprecated
-    public final synchronized void removeLayer(final Layer layer) {
-        if (map != null) {
-            getLayerManager().removeLayer(layer);
-        }
-    }
-
     private static volatile InitStatusListener initListener;
 
     public interface InitStatusListener {
@@ -564,6 +530,10 @@ public abstract class Main {
             for (Future<Void> i : service.invokeAll(tasks)) {
                 i.get();
             }
+            // asynchronous initializations to be completed eventually
+            service.submit((Runnable) TMSLayer::getCache);
+            service.submit((Runnable) OsmValidator::initializeTests);
+            service.submit(OverpassTurboQueryWizard::getInstance);
             service.shutdown();
         } catch (InterruptedException | ExecutionException ex) {
             throw new RuntimeException(ex);
@@ -626,24 +596,6 @@ public abstract class Main {
      * Add a new layer to the map.
      *
      * If no map exists, create one.
-     * <p>
-     * To be removed end of 2016
-     *
-     * @param layer the layer
-     *
-     * @see #addLayer(Layer, ProjectionBounds)
-     * @see #addLayer(Layer, ViewportData)
-     * @deprecated You can add the layer to the layer manager: {@link #getLayerManager()}
-     */
-    @Deprecated
-    public final void addLayer(final Layer layer) {
-        addLayer(layer, (ViewportData) null);
-    }
-
-    /**
-     * Add a new layer to the map.
-     *
-     * If no map exists, create one.
      *
      * @param layer the layer
      * @param bounds the bounds of the layer (target zoom area); can be null, then
@@ -670,60 +622,6 @@ public abstract class Main {
     }
 
     /**
-     * Creates the map frame. Call only in EDT Thread.
-     * <p>
-     * To be removed any time
-     * @param firstLayer The first layer that was added.
-     * @param viewportData The initial viewport. Can be <code>null</code> to be automatically computed.
-     * @deprecated Not supported. MainPanel does this automatically.
-     */
-    @Deprecated
-    public synchronized void createMapFrame(Layer firstLayer, ViewportData viewportData) {
-        GuiHelper.assertCallFromEdt();
-        Main.error("createMapFrame() not supported any more.");
-    }
-
-    /**
-     * Replies <code>true</code> if there is an edit layer
-     * <p>
-     * To be removed end of 2016
-     *
-     * @return <code>true</code> if there is an edit layer
-     * @deprecated You can get the edit layer using the layer manager and then check if it is not null: {@link #getLayerManager()}
-     */
-    @Deprecated
-    public boolean hasEditLayer() {
-        if (getEditLayer() == null) return false;
-        return true;
-    }
-
-    /**
-     * Replies the current edit layer
-     * <p>
-     * To be removed end of 2016
-     *
-     * @return the current edit layer. <code>null</code>, if no current edit layer exists
-     * @deprecated You can get the edit layer using the layer manager: {@link #getLayerManager()}
-     */
-    @Deprecated
-    public OsmDataLayer getEditLayer() {
-        return getLayerManager().getEditLayer();
-    }
-
-    /**
-     * Replies the current data set.
-     * <p>
-     * To be removed end of 2016
-     *
-     * @return the current data set. <code>null</code>, if no current data set exists
-     * @deprecated You can get the data set using the layer manager: {@link #getLayerManager()}
-     */
-    @Deprecated
-    public DataSet getCurrentDataSet() {
-        return getLayerManager().getEditDataSet();
-    }
-
-    /**
      * Replies the current selected primitives, from a end-user point of view.
      * It is not always technically the same collection of primitives than {@link DataSet#getSelected()}.
      * Indeed, if the user is currently in drawing mode, only the way currently being drawn is returned,
@@ -742,19 +640,6 @@ public abstract class Main {
         }
     }
 
-    /**
-     * Returns the currently active  layer
-     * <p>
-     * To be removed end of 2016
-     *
-     * @return the currently active layer. <code>null</code>, if currently no active layer exists
-     * @deprecated You can get the layer using the layer manager: {@link #getLayerManager()}
-     */
-    @Deprecated
-    public Layer getActiveLayer() {
-        return getLayerManager().getActiveLayer();
-    }
-
     protected static final JPanel contentPanePrivate = new JPanel(new BorderLayout());
 
     public static void redirectToMainContentPane(JComponent source) {
@@ -910,69 +795,19 @@ public abstract class Main {
     }
 
     /**
-     * Asks user to perform "save layer" operations (save on disk and/or upload data to server) for all
-     * {@link AbstractModifiableLayer} before JOSM exits.
-     * @return {@code true} if there was nothing to save, or if the user wants to proceed to save operations.
-     *         {@code false} if the user cancels.
-     * @since 2025
-     */
-    public static boolean saveUnsavedModifications() {
-        if (!isDisplayingMapView()) return true;
-        return saveUnsavedModifications(getLayerManager().getLayersOfType(AbstractModifiableLayer.class), true);
-    }
-
-    /**
-     * Asks user to perform "save layer" operations (save on disk and/or upload data to server) before data layers deletion.
-     *
-     * @param selectedLayers The layers to check. Only instances of {@link AbstractModifiableLayer} are considered.
-     * @param exit {@code true} if JOSM is exiting, {@code false} otherwise.
-     * @return {@code true} if there was nothing to save, or if the user wants to proceed to save operations.
-     *         {@code false} if the user cancels.
-     * @since 5519
-     */
-    public static boolean saveUnsavedModifications(Iterable<? extends Layer> selectedLayers, boolean exit) {
-        SaveLayersDialog dialog = new SaveLayersDialog(parent);
-        List<AbstractModifiableLayer> layersWithUnmodifiedChanges = new ArrayList<>();
-        for (Layer l: selectedLayers) {
-            if (!(l instanceof AbstractModifiableLayer)) {
-                continue;
-            }
-            AbstractModifiableLayer odl = (AbstractModifiableLayer) l;
-            if (odl.isModified() &&
-                    ((!odl.isSavable() && !odl.isUploadable()) ||
-                     odl.requiresSaveToFile() ||
-                     (odl.requiresUploadToServer() && !odl.isUploadDiscouraged()))) {
-                layersWithUnmodifiedChanges.add(odl);
-            }
-        }
-        if (exit) {
-            dialog.prepareForSavingAndUpdatingLayersBeforeExit();
-        } else {
-            dialog.prepareForSavingAndUpdatingLayersBeforeDelete();
-        }
-        if (!layersWithUnmodifiedChanges.isEmpty()) {
-            dialog.getModel().populate(layersWithUnmodifiedChanges);
-            dialog.setVisible(true);
-            switch(dialog.getUserAction()) {
-            case PROCEED: return true;
-            case CANCEL:
-            default: return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
      * Closes JOSM and optionally terminates the Java Virtual Machine (JVM).
      * If there are some unsaved data layers, asks first for user confirmation.
      * @param exit If {@code true}, the JVM is terminated by running {@link System#exit} with a given return code.
      * @param exitCode The return code
+     * @param reason the reason for exiting
      * @return {@code true} if JOSM has been closed, {@code false} if the user has cancelled the operation.
-     * @since 3378
+     * @since 11093 (3378 with a different function signature)
      */
-    public static boolean exitJosm(boolean exit, int exitCode) {
-        if (Main.saveUnsavedModifications()) {
+    public static boolean exitJosm(boolean exit, int exitCode, SaveLayersDialog.Reason reason) {
+        final boolean proceed = Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() ->
+                SaveLayersDialog.saveUnsavedModifications(getLayerManager().getLayers(),
+                        reason != null ? reason : SaveLayersDialog.Reason.EXIT)));
+        if (proceed) {
             if (Main.main != null) {
                 Main.main.shutdown();
             }
@@ -986,9 +821,11 @@ public abstract class Main {
     }
 
     protected void shutdown() {
-        worker.shutdown();
-        ImageProvider.shutdown(false);
-        JCSCacheManager.shutdown();
+        if (!GraphicsEnvironment.isHeadless()) {
+            worker.shutdown();
+            ImageProvider.shutdown(false);
+            JCSCacheManager.shutdown();
+        }
         if (map != null) {
             map.rememberToggleDialogWidth();
         }
@@ -999,8 +836,10 @@ public abstract class Main {
         } catch (IOException ex) {
             Main.warn(ex, tr("Failed to save default preferences."));
         }
-        worker.shutdownNow();
-        ImageProvider.shutdown(true);
+        if (!GraphicsEnvironment.isHeadless()) {
+            worker.shutdownNow();
+            ImageProvider.shutdown(true);
+        }
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
index 290465d..3638b01 100644
--- a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
+++ b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
@@ -58,7 +58,7 @@ public abstract class AbstractMergeAction extends JosmAction {
     }
 
     protected static Layer askTargetLayer(List<Layer> targetLayers) {
-        return askTargetLayer(targetLayers.toArray(new Layer[0]),
+        return askTargetLayer(targetLayers.toArray(new Layer[targetLayers.size()]),
                 tr("Please select the target layer."),
                 tr("Select target layer"),
                 tr("Merge"), "dialogs/mergedown");
diff --git a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
index 2325ffa..b6caa75 100644
--- a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
@@ -10,7 +10,10 @@ import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.swing.JComboBox;
@@ -21,6 +24,7 @@ import javax.swing.JScrollPane;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+import org.openstreetmap.josm.data.imagery.WMTSTileSource;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.AlignImageryPanel;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
@@ -29,6 +33,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.imagery.WMSImagery;
 import org.openstreetmap.josm.io.imagery.WMSImagery.LayerDetails;
 import org.openstreetmap.josm.io.imagery.WMSImagery.WMSGetCapabilitiesException;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -62,18 +67,66 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
         }
     }
 
+    /**
+     * Converts general ImageryInfo to specific one, that does not need any user action to initialize
+     * see: https://josm.openstreetmap.de/ticket/13868
+     * @param info ImageryInfo that will be converted (or returned when no conversion needed)
+     * @return ImageryInfo object that's ready to be used to create TileSource
+     */
+    private ImageryInfo convertImagery(ImageryInfo info) {
+        try {
+            switch(info.getImageryType()) {
+            case WMS_ENDPOINT:
+                // convert to WMS type
+                return getWMSLayerInfo();
+            case WMTS:
+                // specify which layer to use
+                String layerId = new WMTSTileSource(info).userSelectLayer();
+                if (layerId != null) {
+                    ImageryInfo copy = new ImageryInfo(info);
+                    Collection<String> defaultLayers = new ArrayList<>(1);
+                    defaultLayers.add(layerId);
+                    copy.setDefaultLayers(defaultLayers);
+                    return copy;
+                }
+                // layer not selected - refuse to add
+                return null;
+            default:
+                return info;
+            }
+        } catch (MalformedURLException ex) {
+            if (!GraphicsEnvironment.isHeadless()) {
+                JOptionPane.showMessageDialog(Main.parent, tr("Invalid service URL."),
+                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
+            }
+            Main.error(ex, false);
+        } catch (IOException ex) {
+            if (!GraphicsEnvironment.isHeadless()) {
+                JOptionPane.showMessageDialog(Main.parent, tr("Could not retrieve WMS layer list."),
+                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
+            }
+            Main.error(ex, false);
+        } catch (WMSGetCapabilitiesException ex) {
+            if (!GraphicsEnvironment.isHeadless()) {
+                JOptionPane.showMessageDialog(Main.parent, tr("Could not parse WMS layer list."),
+                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
+            }
+            Main.error(ex, "Could not parse WMS layer list. Incoming data:\n"+ex.getIncomingData());
+        }
+        return null;
+    }
+
     @Override
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled()) return;
         try {
-            final ImageryInfo infoToAdd = ImageryType.WMS_ENDPOINT.equals(info.getImageryType())
-                    ? getWMSLayerInfo() : info;
+            final ImageryInfo infoToAdd = convertImagery(info);
             if (infoToAdd != null) {
                 Main.getLayerManager().addLayer(ImageryLayer.create(infoToAdd));
                 AlignImageryPanel.addNagPanelIfNeeded(infoToAdd);
             }
         } catch (IllegalArgumentException ex) {
-            if (ex.getMessage() == null || ex.getMessage().isEmpty()) {
+            if (ex.getMessage() == null || ex.getMessage().isEmpty() || GraphicsEnvironment.isHeadless()) {
                 throw ex;
             } else {
                 JOptionPane.showMessageDialog(Main.parent,
@@ -83,84 +136,65 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
         }
     }
 
-    protected ImageryInfo getWMSLayerInfo() {
-        try {
-            assert ImageryType.WMS_ENDPOINT.equals(info.getImageryType());
-            final WMSImagery wms = new WMSImagery();
-            wms.attemptGetCapabilities(info.getUrl());
+    protected ImageryInfo getWMSLayerInfo() throws IOException, WMSGetCapabilitiesException {
+        CheckParameterUtil.ensureThat(ImageryType.WMS_ENDPOINT.equals(info.getImageryType()), "wms_endpoint imagery type expected");
 
-            final WMSLayerTree tree = new WMSLayerTree();
-            tree.updateTree(wms);
-            final JComboBox<String> formats = new JComboBox<>(wms.getFormats().toArray(new String[0]));
-            formats.setSelectedItem(wms.getPreferredFormats());
-            formats.setToolTipText(tr("Select image format for WMS layer"));
+        final WMSImagery wms = new WMSImagery();
+        wms.attemptGetCapabilities(info.getUrl());
 
-            if (!GraphicsEnvironment.isHeadless()) {
-                if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")}) { {
-                    final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
-                    scrollPane.setPreferredSize(new Dimension(400, 400));
-                    final JPanel panel = new JPanel(new GridBagLayout());
-                    panel.add(scrollPane, GBC.eol().fill());
-                    panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
-                    setContent(panel);
-                } }.showDialog().getValue()) {
-                    return null;
-                }
-            }
+        final WMSLayerTree tree = new WMSLayerTree();
+        tree.updateTree(wms);
+        List<String> wmsFormats = wms.getFormats();
+        final JComboBox<String> formats = new JComboBox<>(wmsFormats.toArray(new String[wmsFormats.size()]));
+        formats.setSelectedItem(wms.getPreferredFormats());
+        formats.setToolTipText(tr("Select image format for WMS layer"));
 
-            final String url = wms.buildGetMapUrl(
-                    tree.getSelectedLayers(), (String) formats.getSelectedItem());
-            Set<String> supportedCrs = new HashSet<>();
-            boolean first = true;
-            StringBuilder layersString = new StringBuilder();
-            for (LayerDetails layer: tree.getSelectedLayers()) {
-                if (first) {
-                    supportedCrs.addAll(layer.getProjections());
-                    first = false;
-                }
-                layersString.append(layer.name);
-                layersString.append(", ");
-                supportedCrs.retainAll(layer.getProjections());
+        if (!GraphicsEnvironment.isHeadless()) {
+            if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")}) { {
+                final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
+                scrollPane.setPreferredSize(new Dimension(400, 400));
+                final JPanel panel = new JPanel(new GridBagLayout());
+                panel.add(scrollPane, GBC.eol().fill());
+                panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
+                setContent(panel);
+            } }.showDialog().getValue()) {
+                return null;
             }
+        }
 
-            ImageryInfo ret = new ImageryInfo(info.getName(), url, "wms", info.getEulaAcceptanceRequired(), info.getCookies());
-            if (layersString.length() > 2) {
-                ret.setName(ret.getName() + ' ' + layersString.substring(0, layersString.length() - 2));
-            }
-            ret.setServerProjections(supportedCrs);
-            return ret;
-        } catch (MalformedURLException ex) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Invalid service URL."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            Main.error(ex, false);
-        } catch (IOException ex) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Could not retrieve WMS layer list."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            Main.error(ex, false);
-        } catch (WMSGetCapabilitiesException ex) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Could not parse WMS layer list."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
+        final String url = wms.buildGetMapUrl(
+                tree.getSelectedLayers(), (String) formats.getSelectedItem());
+        Set<String> supportedCrs = new HashSet<>();
+        boolean first = true;
+        StringBuilder layersString = new StringBuilder();
+        for (LayerDetails layer: tree.getSelectedLayers()) {
+            if (first) {
+                supportedCrs.addAll(layer.getProjections());
+                first = false;
             }
-            Main.error(ex, "Could not parse WMS layer list. Incoming data:\n"+ex.getIncomingData());
+            layersString.append(layer.name);
+            layersString.append(", ");
+            supportedCrs.retainAll(layer.getProjections());
         }
-        return null;
+
+        // copy all information from WMS
+        ImageryInfo ret = new ImageryInfo(info);
+        // and update according to user choice
+        ret.setUrl(url);
+        ret.setImageryType(ImageryType.WMS);
+        if (layersString.length() > 2) {
+            ret.setName(ret.getName() + ' ' + layersString.substring(0, layersString.length() - 2));
+        }
+        ret.setServerProjections(supportedCrs);
+        return ret;
     }
 
     @Override
     protected void updateEnabledState() {
-        ImageryType type = info.getImageryType();
-        // never enable blacklisted entries. Do not add same imagery layer twice (fix #2519)
         if (info.isBlacklisted()) {
             setEnabled(false);
-        } else if (type == ImageryType.TMS || type == ImageryType.BING || type == ImageryType.SCANEX) {
-            setEnabled(true);
         } else {
-            setEnabled(!Main.getLayerManager().getLayers().isEmpty());
+            setEnabled(true);
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/actions/CombineWayAction.java b/src/org/openstreetmap/josm/actions/CombineWayAction.java
index 10390fa..4d3bb3f 100644
--- a/src/org/openstreetmap/josm/actions/CombineWayAction.java
+++ b/src/org/openstreetmap/josm/actions/CombineWayAction.java
@@ -76,7 +76,6 @@ public class CombineWayAction extends JosmAction {
         new Notification(msg)
                 .setIcon(JOptionPane.INFORMATION_MESSAGE)
                 .show();
-        return;
     }
 
     protected static Way getTargetWay(Collection<Way> combinedWays) {
diff --git a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
index 59b12f9..366f8e6 100644
--- a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
+++ b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
@@ -334,7 +334,7 @@ public class CreateMultipolygonAction extends JosmAction {
                 rel.setMember(i, new RelationMember(role, m.getMember()));
             }
         }
-        ways.removeAll(rel.getMemberPrimitives());
+        ways.removeAll(rel.getMemberPrimitivesList());
         for (final Way way : ways) {
             rel.addMember(new RelationMember(role, way));
         }
diff --git a/src/org/openstreetmap/josm/actions/DeleteLayerAction.java b/src/org/openstreetmap/josm/actions/DeleteLayerAction.java
index e7a58b5..4e7ec26 100644
--- a/src/org/openstreetmap/josm/actions/DeleteLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/DeleteLayerAction.java
@@ -9,6 +9,7 @@ import java.awt.event.KeyEvent;
 import java.util.Collections;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -33,7 +34,7 @@ public final class DeleteLayerAction extends JosmAction {
         if (activeLayer == null) {
             return;
         }
-        if (!Main.saveUnsavedModifications(Collections.singletonList(activeLayer), false)) {
+        if (!SaveLayersDialog.saveUnsavedModifications(Collections.singletonList(activeLayer), SaveLayersDialog.Reason.DELETE)) {
             return;
         }
         Main.getLayerManager().removeLayer(activeLayer);
diff --git a/src/org/openstreetmap/josm/actions/DistributeAction.java b/src/org/openstreetmap/josm/actions/DistributeAction.java
index 10945d7..2a50a89 100644
--- a/src/org/openstreetmap/josm/actions/DistributeAction.java
+++ b/src/org/openstreetmap/josm/actions/DistributeAction.java
@@ -210,7 +210,7 @@ public final class DistributeAction extends JosmAction {
     private static Collection<Command> distributeNodes(Collection<Node> nodes) {
         // Find from the selected nodes two that are the furthest apart.
         // Let's call them A and B.
-        double distance = 0;
+        double distance = Double.NEGATIVE_INFINITY;
 
         Node nodea = null;
         Node nodeb = null;
@@ -255,7 +255,7 @@ public final class DistributeAction extends JosmAction {
             Node s = null;
 
             // Find the node that is furthest from B (i.e. closest to A)
-            distance = 0.0;
+            distance = Double.NEGATIVE_INFINITY;
             for (Node n : nodes) {
                 double dist = Math.sqrt(nodeb.getEastNorth().distance(n.getEastNorth()));
                 if (dist > distance) {
diff --git a/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java b/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
index 8ab0b71..28a597c 100644
--- a/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
+++ b/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
@@ -22,13 +22,15 @@ import org.openstreetmap.josm.tools.Shortcut;
  */
 public class DownloadPrimitiveAction extends JosmAction {
 
+    public static final Shortcut SHORTCUT = Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")),
+            KeyEvent.VK_O, Shortcut.CTRL_SHIFT);
+
     /**
      * Constructs a new {@code DownloadPrimitiveAction}.
      */
     public DownloadPrimitiveAction() {
         super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID."),
-                Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")),
-                        KeyEvent.VK_O, Shortcut.CTRL_SHIFT), true);
+                SHORTCUT, true);
         putValue("help", ht("/Action/DownloadObject"));
     }
 
diff --git a/src/org/openstreetmap/josm/actions/ExitAction.java b/src/org/openstreetmap/josm/actions/ExitAction.java
index 78ab972..8c875a2 100644
--- a/src/org/openstreetmap/josm/actions/ExitAction.java
+++ b/src/org/openstreetmap/josm/actions/ExitAction.java
@@ -27,6 +27,6 @@ public class ExitAction extends JosmAction {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        Main.exitJosm(true, 0);
+        Main.exitJosm(true, 0, null);
     }
 }
diff --git a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
index 7272264..b33a5a0 100644
--- a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
+++ b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
@@ -251,14 +251,16 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
         }
 
         private void updateOffsetIntl() {
-            // Support projections with very small numbers (e.g. 4326)
-            int precision = Main.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;
-            // US locale to force decimal separator to be '.'
-            try (Formatter us = new Formatter(Locale.US)) {
-                TileSourceDisplaySettings ds = layer.getDisplaySettings();
-                tOffset.setText(us.format(new StringBuilder()
-                    .append("%1.").append(precision).append("f; %1.").append(precision).append('f').toString(),
-                    ds.getDx(), ds.getDy()).toString());
+            if (layer != null) {
+                // Support projections with very small numbers (e.g. 4326)
+                int precision = Main.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;
+                // US locale to force decimal separator to be '.'
+                try (Formatter us = new Formatter(Locale.US)) {
+                    TileSourceDisplaySettings ds = layer.getDisplaySettings();
+                    tOffset.setText(us.format(new StringBuilder()
+                        .append("%1.").append(precision).append("f; %1.").append(precision).append('f').toString(),
+                        ds.getDx(), ds.getDy()).toString());
+                }
             }
         }
 
@@ -285,6 +287,7 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
                 return;
             }
             super.buttonAction(buttonIndex, evt);
+            restoreMapModeState();
         }
 
         @Override
@@ -303,23 +306,23 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
             Main.main.menu.imageryMenu.refreshOffsetMenu();
         }
 
+        private void restoreMapModeState() {
+            if (Main.map == null)
+                return;
+            if (oldMapMode != null) {
+                Main.map.selectMapMode(oldMapMode);
+                oldMapMode = null;
+            } else {
+                Main.map.selectSelectTool(false);
+            }
+        }
+
         class WindowEventHandler extends WindowAdapter {
             @Override
             public void windowClosing(WindowEvent e) {
                 setVisible(false);
                 restoreMapModeState();
             }
-
-            private void restoreMapModeState() {
-                if (Main.map == null)
-                    return;
-                if (oldMapMode != null) {
-                    Main.map.selectMapMode(oldMapMode);
-                    oldMapMode = null;
-                } else {
-                    Main.map.selectSelectTool(false);
-                }
-            }
         }
     }
 
diff --git a/src/org/openstreetmap/josm/actions/JosmAction.java b/src/org/openstreetmap/josm/actions/JosmAction.java
index 9b3bd4a..3153ee4 100644
--- a/src/org/openstreetmap/josm/actions/JosmAction.java
+++ b/src/org/openstreetmap/josm/actions/JosmAction.java
@@ -22,7 +22,6 @@ import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -37,8 +36,7 @@ import org.openstreetmap.josm.tools.Shortcut;
  * A JosmAction can register a {@link LayerChangeListener} and a {@link SelectionChangedListener}. Upon
  * a layer change event or a selection change event it invokes {@link #updateEnabledState()}.
  * Subclasses can override {@link #updateEnabledState()} in order to update the {@link #isEnabled()}-state
- * of a JosmAction depending on the {@link #getCurrentDataSet()} and the current layers
- * (see also {@link #getEditLayer()}).
+ * of a JosmAction depending on the {@link #getLayerManager()} state.
  *
  * destroy() from interface Destroyable is called e.g. for MapModes, when the last layer has
  * been removed and so the mapframe will be destroyed. For other JosmActions, destroy() may never
@@ -269,28 +267,6 @@ public abstract class JosmAction extends AbstractAction implements Destroyable {
         return Main.getLayerManager();
     }
 
-    /**
-     * Replies the current edit layer
-     *
-     * @return the current edit layer. null, if no edit layer exists
-     * @deprecated Use {@link #getLayerManager()}.getEditLayer() instead. To be removed in end of 2016.
-     */
-    @Deprecated
-    public static OsmDataLayer getEditLayer() {
-        return Main.getLayerManager().getEditLayer();
-    }
-
-    /**
-     * Replies the current dataset.
-     *
-     * @return the current dataset. null, if no current dataset exists
-     * @deprecated Use {@link #getLayerManager()}.getEditDataSet() instead. To be removed in end of 2016.
-     */
-    @Deprecated
-    public static DataSet getCurrentDataSet() {
-        return Main.getLayerManager().getEditDataSet();
-    }
-
     protected static void waitFuture(final Future<?> future, final PleaseWaitProgressMonitor monitor) {
         Main.worker.submit(() -> {
                         try {
diff --git a/src/org/openstreetmap/josm/actions/JumpToAction.java b/src/org/openstreetmap/josm/actions/JumpToAction.java
index b0d7ed9..260ae91 100644
--- a/src/org/openstreetmap/josm/actions/JumpToAction.java
+++ b/src/org/openstreetmap/josm/actions/JumpToAction.java
@@ -19,7 +19,6 @@ import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.dialogs.LatLonDialog;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -147,7 +146,7 @@ public class JumpToAction extends JosmAction {
                 ll = new LatLon(Double.parseDouble(lat.getText()), Double.parseDouble(lon.getText()));
             } catch (NumberFormatException ex) {
                 try {
-                    ll = LatLonDialog.parseLatLon(lat.getText() + "; " + lon.getText());
+                    ll = LatLon.parse(lat.getText() + "; " + lon.getText());
                 } catch (IllegalArgumentException ex2) {
                     JOptionPane.showMessageDialog(Main.parent,
                             tr("Could not parse Latitude, Longitude or Zoom. Please check."),
@@ -198,7 +197,7 @@ public class JumpToAction extends JosmAction {
             // available on standard renderers, so choose this is in case m should be zero
             int zoomLvl = 18;
             if (m > 0)
-                zoomLvl = (int) Math.round((-1) * Math.log(m/10000000)/Math.log(2));
+                zoomLvl = (int) Math.round((-1) * Math.log(m/10_000_000)/Math.log(2));
 
             url.setText(OsmUrlToBounds.getURL(dlat, dlon, zoomLvl));
         } catch (NumberFormatException x) {
diff --git a/src/org/openstreetmap/josm/actions/MergeLayerAction.java b/src/org/openstreetmap/josm/actions/MergeLayerAction.java
index 05c5480..856e192 100644
--- a/src/org/openstreetmap/josm/actions/MergeLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/MergeLayerAction.java
@@ -46,7 +46,8 @@ public class MergeLayerAction extends AbstractMergeAction {
                     if (sourceLayer != null && !sourceLayer.equals(targetLayer)) {
                         if (sourceLayer instanceof OsmDataLayer && targetLayer instanceof OsmDataLayer
                                 && ((OsmDataLayer) sourceLayer).isUploadDiscouraged() != ((OsmDataLayer) targetLayer).isUploadDiscouraged()) {
-                            if (warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)) {
+                            if (Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() ->
+                                    warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)))) {
                                 break;
                             }
                         }
diff --git a/src/org/openstreetmap/josm/actions/MergeNodesAction.java b/src/org/openstreetmap/josm/actions/MergeNodesAction.java
index 601a04c..7581c41 100644
--- a/src/org/openstreetmap/josm/actions/MergeNodesAction.java
+++ b/src/org/openstreetmap/josm/actions/MergeNodesAction.java
@@ -103,19 +103,18 @@ public class MergeNodesAction extends JosmAction {
         int size = candidates.size();
         if (size == 0)
             throw new IllegalArgumentException("empty list");
+        if (size == 1) // to avoid division by 0 in mode 2
+            return candidates.get(0);
 
         switch (Main.pref.getInteger("merge-nodes.mode", 0)) {
         case 0:
-            Node targetNode = candidates.get(size - 1);
-            for (final Node n : candidates) { // pick last one
-                targetNode = n;
-            }
-            return targetNode;
+            return candidates.get(size - 1);
         case 1:
             double east1 = 0, north1 = 0;
             for (final Node n : candidates) {
-                east1 += n.getEastNorth().east();
-                north1 += n.getEastNorth().north();
+                EastNorth en = n.getEastNorth();
+                east1 += en.east();
+                north1 += en.north();
             }
 
             return new Node(new EastNorth(east1 / size, north1 / size));
@@ -161,14 +160,10 @@ public class MergeNodesAction extends JosmAction {
             if (!n.isNew()) {
                 // Among existing nodes, try to keep the oldest used one
                 if (!n.getReferrers().isEmpty()) {
-                    if (targetNode == null) {
-                        targetNode = n;
-                    } else if (n.getId() < targetNode.getId()) {
+                    if (targetNode == null || n.getId() < targetNode.getId()) {
                         targetNode = n;
                     }
-                } else if (oldestNode == null) {
-                    oldestNode = n;
-                } else if (n.getId() < oldestNode.getId()) {
+                } else if (oldestNode == null || n.getId() < oldestNode.getId()) {
                     oldestNode = n;
                 }
             }
@@ -200,9 +195,7 @@ public class MergeNodesAction extends JosmAction {
             for (Node n: w.getNodes()) {
                 if (!nodesToDelete.contains(n) && !n.equals(targetNode)) {
                     newNodes.add(n);
-                } else if (newNodes.isEmpty()) {
-                    newNodes.add(targetNode);
-                } else if (!newNodes.get(newNodes.size()-1).equals(targetNode)) {
+                } else if (newNodes.isEmpty() || !newNodes.get(newNodes.size()-1).equals(targetNode)) {
                     // make sure we collapse a sequence of deleted nodes
                     // to exactly one occurrence of the merged target node
                     newNodes.add(targetNode);
diff --git a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
index c6b4027..4d6c80e 100644
--- a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
+++ b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
@@ -25,7 +25,6 @@ import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
@@ -124,6 +123,16 @@ public final class OrthogonalizeAction extends JosmAction {
                         .show();
             }
         }
+
+        @Override
+        protected void updateEnabledState() {
+            updateEnabledStateOnCurrentSelection();
+        }
+
+        @Override
+        protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+            setEnabled(selection != null && !selection.isEmpty());
+        }
     }
 
     @Override
@@ -617,8 +626,7 @@ public final class OrthogonalizeAction extends JosmAction {
 
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.selectionEmpty());
+        updateEnabledStateOnCurrentSelection();
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/actions/RestartAction.java b/src/org/openstreetmap/josm/actions/RestartAction.java
index 9f86416..6d7c9e4 100644
--- a/src/org/openstreetmap/josm/actions/RestartAction.java
+++ b/src/org/openstreetmap/josm/actions/RestartAction.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -58,7 +59,7 @@ public class RestartAction extends JosmAction {
         // Request for restart is indicated by exit code 9.
         String scriptRestart = System.getProperty("josm.restart");
         if ("true".equals(scriptRestart)) {
-            Main.exitJosm(true, 9);
+            Main.exitJosm(true, 9, SaveLayersDialog.Reason.RESTART);
         }
 
         try {
@@ -82,7 +83,7 @@ public class RestartAction extends JosmAction {
      * @throws IOException in case of any I/O error
      */
     public static void restartJOSM() throws IOException {
-        if (isRestartSupported() && !Main.exitJosm(false, 0)) return;
+        if (isRestartSupported() && !Main.exitJosm(false, 0, SaveLayersDialog.Reason.RESTART)) return;
         final List<String> cmd;
         // special handling for OSX .app package
         if (Main.isPlatformOsx() && System.getProperty("java.library.path").contains("/JOSM.app/Contents/MacOS")) {
diff --git a/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java b/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
index f35d095..188a027 100644
--- a/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
+++ b/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
@@ -130,9 +130,7 @@ public class SessionSaveAsAction extends DiskAccessAction implements MapFrameLis
 
         boolean zip;
         FileFilter ff = fc.getFileFilter();
-        if (zipRequired) {
-            zip = true;
-        } else if (joz.equals(ff)) {
+        if (zipRequired || joz.equals(ff)) {
             zip = true;
         } else if (jos.equals(ff)) {
             zip = false;
diff --git a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
index c0376a1..fe79107 100644
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
@@ -109,7 +109,7 @@ public final class ShowStatusReportAction extends JosmAction {
             .append((int) maxScreenSize.getWidth()).append('x')
             .append((int) maxScreenSize.getHeight()).append('\n');
 
-        if (Main.platform.getClass() == PlatformHookUnixoid.class) {
+        if (Main.platform instanceof PlatformHookUnixoid) {
             // Add Java package details
             String packageDetails = ((PlatformHookUnixoid) Main.platform).getJavaPackageDetails();
             if (packageDetails != null) {
@@ -177,7 +177,7 @@ public final class ShowStatusReportAction extends JosmAction {
                 }
             }
         }
-        text.append("\n");
+        text.append('\n');
         appendCollection(text, "Plugins", Utils.transform(PluginHandler.getBugReportInformation(), i -> "+ " + i));
         appendCollection(text, "Tagging presets", getCustomUrls(TaggingPresetPreference.PresetPrefHelper.INSTANCE));
         appendCollection(text, "Map paint styles", getCustomUrls(MapPaintPreference.MapPaintPrefHelper.INSTANCE));
@@ -293,7 +293,7 @@ public final class ShowStatusReportAction extends JosmAction {
         ed.setPreferredSize(new Dimension(700, Main.parent.getHeight()-50));
 
         switch (ed.showDialog().getValue()) {
-            case 1: ta.copyToClippboard(); break;
+            case 1: ta.copyToClipboard(); break;
             case 2: BugReportSender.reportBug(reportHeader); break;
             default: // Do nothing
         }
diff --git a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
index 8a979c3..b7e15d3 100644
--- a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
@@ -8,6 +8,7 @@ import static org.openstreetmap.josm.tools.I18n.trn;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -100,9 +101,7 @@ public class SimplifyWayAction extends JosmAction {
             if (ways.isEmpty()) {
                 alertSelectAtLeastOneWay();
                 return;
-            } else if (!confirmWayWithNodesOutsideBoundingBox(ways)) {
-                return;
-            } else if (ways.size() > 10 && !confirmSimplifyManyWays(ways.size())) {
+            } else if (!confirmWayWithNodesOutsideBoundingBox(ways) || (ways.size() > 10 && !confirmSimplifyManyWays(ways.size()))) {
                 return;
             }
 
@@ -135,7 +134,11 @@ public class SimplifyWayAction extends JosmAction {
      * in order to simplify the way.
      */
     protected boolean isRequiredNode(Way way, Node node) {
-        boolean isRequired = Collections.frequency(way.getNodes(), node) > 1;
+        int frequency = Collections.frequency(way.getNodes(), node);
+        if ((way.getNode(0) == node) && (way.getNode(way.getNodesCount()-1) == node)) {
+            frequency = frequency - 1; // closed way closing node counted only once
+        }
+        boolean isRequired = frequency > 1;
         if (!isRequired) {
             List<OsmPrimitive> parents = new LinkedList<>();
             parents.addAll(node.getReferrers());
@@ -190,6 +193,19 @@ public class SimplifyWayAction extends JosmAction {
             i++;
         }
 
+        if ((newNodes.size() > 3) && (newNodes.get(0) == newNodes.get(newNodes.size() - 1))) {
+            // Closed way, check if the first node could also be simplified ...
+            if (!isRequiredNode(w, newNodes.get(0))) {
+                final List<Node> l1 = Arrays.asList(newNodes.get(newNodes.size() - 2), newNodes.get(0), newNodes.get(1));
+                final List<Node> l2 = new ArrayList<>(3);
+                buildSimplifiedNodeList(l1, 0, 2, threshold, l2);
+                if (!l2.contains(newNodes.get(0))) {
+                    newNodes.remove(0);
+                    newNodes.set(newNodes.size() - 1, newNodes.get(0)); // close the way
+                }
+            }
+        }
+
         Set<Node> delNodes = new HashSet<>();
         delNodes.addAll(w.getNodes());
         delNodes.removeAll(newNodes);
@@ -254,18 +270,18 @@ public class SimplifyWayAction extends JosmAction {
     /* From Aviaton Formulary v1.3
      * http://williams.best.vwh.net/avform.htm
      */
-    public static double dist(double lat1, double lon1, double lat2, double lon2) {
+    private static double dist(double lat1, double lon1, double lat2, double lon2) {
         return 2 * Math.asin(Math.sqrt(Math.pow(Math.sin((lat1 - lat2) / 2), 2) + Math.cos(lat1) * Math.cos(lat2)
                 * Math.pow(Math.sin((lon1 - lon2) / 2), 2)));
     }
 
-    public static double course(double lat1, double lon1, double lat2, double lon2) {
+    private static double course(double lat1, double lon1, double lat2, double lon2) {
         return Math.atan2(Math.sin(lon1 - lon2) * Math.cos(lat2), Math.cos(lat1) * Math.sin(lat2) - Math.sin(lat1)
                 * Math.cos(lat2) * Math.cos(lon1 - lon2))
                 % (2 * Math.PI);
     }
 
-    public static double xtd(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3) {
+    private static double xtd(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3) {
         double distAD = dist(lat1, lon1, lat3, lon3);
         double crsAD = course(lat1, lon1, lat3, lon3);
         double crsAB = course(lat1, lon1, lat2, lon2);
diff --git a/src/org/openstreetmap/josm/actions/UploadSelectionAction.java b/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
index 0b1f6cb..0c5ec3f 100644
--- a/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
@@ -78,9 +78,7 @@ public class UploadSelectionAction extends JosmAction {
     protected Set<OsmPrimitive> getModifiedPrimitives(Collection<OsmPrimitive> primitives) {
         Set<OsmPrimitive> ret = new HashSet<>();
         for (OsmPrimitive p: primitives) {
-            if (p.isNewOrUndeleted()) {
-                ret.add(p);
-            } else if (p.isModified() && !p.isIncomplete()) {
+            if (p.isNewOrUndeleted() || (p.isModified() && !p.isIncomplete())) {
                 ret.add(p);
             }
         }
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
index 33d467a..28362a8 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
@@ -5,9 +5,11 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -38,6 +40,8 @@ public class DownloadGpsTask extends AbstractDownloadTask<GpxData> {
     private DownloadTask downloadTask;
 
     private static final String PATTERN_TRACE_ID = "https?://.*(osm|openstreetmap).org/trace/\\p{Digit}+/data";
+    private static final String PATTERN_USER_TRACE_ID = "https?://.*(osm|openstreetmap).org/user/[^/]+/traces/(\\p{Digit}+)";
+    private static final String PATTERN_EDIT_TRACE_ID = "https?://.*(osm|openstreetmap).org/edit/?\\?gpx=(\\p{Digit}+)(#.*)?";
 
     private static final String PATTERN_TRACKPOINTS_BBOX = "https?://.*/api/0.6/trackpoints\\?bbox=.*,.*,.*,.*";
 
@@ -48,7 +52,11 @@ public class DownloadGpsTask extends AbstractDownloadTask<GpxData> {
 
     @Override
     public String[] getPatterns() {
-        return new String[] {PATTERN_EXTERNAL_GPX_FILE, PATTERN_EXTERNAL_GPX_SCRIPT, PATTERN_TRACE_ID, PATTERN_TRACKPOINTS_BBOX};
+        return new String[] {
+                PATTERN_EXTERNAL_GPX_FILE, PATTERN_EXTERNAL_GPX_SCRIPT,
+                PATTERN_TRACE_ID, PATTERN_USER_TRACE_ID, PATTERN_EDIT_TRACE_ID,
+                PATTERN_TRACKPOINTS_BBOX,
+        };
     }
 
     @Override
@@ -68,6 +76,14 @@ public class DownloadGpsTask extends AbstractDownloadTask<GpxData> {
     @Override
     public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
         CheckParameterUtil.ensureParameterNotNull(url, "url");
+        final Optional<String> mappedUrl = Stream.of(PATTERN_USER_TRACE_ID, PATTERN_EDIT_TRACE_ID)
+                .map(p -> Pattern.compile(p).matcher(url))
+                .filter(Matcher::matches)
+                .map(m -> "https://www.openstreetmap.org/trace/" + m.group(2) + "/data")
+                .findFirst();
+        if (mappedUrl.isPresent()) {
+            return loadUrl(newLayer, mappedUrl.get(), progressMonitor);
+        }
         if (url.matches(PATTERN_TRACE_ID)
          || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT)
          || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
index 80c0efe..9bab5b1 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
@@ -14,6 +14,7 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -231,11 +232,12 @@ public class ImproveWayAccuracyAction extends MapMode implements
             // Highlighting the targetWay in Selecting state
             // Non-native highlighting is used, because sometimes highlighted
             // segments are covered with others, which is bad.
-            g.setStroke(SELECT_TARGET_WAY_STROKE.get());
+            BasicStroke stroke = SELECT_TARGET_WAY_STROKE.get();
+            g.setStroke(stroke);
 
             List<Node> nodes = targetWay.getNodes();
 
-            g.draw(new MapViewPath(mv).append(nodes, false));
+            g.draw(new MapViewPath(mv).append(nodes, false).computeClippedLine(stroke));
 
         } else if (state == State.IMPROVING) {
             // Drawing preview lines and highlighting the node
@@ -299,7 +301,7 @@ public class ImproveWayAccuracyAction extends MapMode implements
                     b.lineTo(p2);
                 }
             }
-            g.draw(b);
+            g.draw(b.computeClippedLine(g.getStroke()));
 
             // Highlighting candidateNode
             if (candidateNode != null) {
@@ -311,7 +313,7 @@ public class ImproveWayAccuracyAction extends MapMode implements
                 b.reset();
                 drawIntersectingWayHelperLines(mv, b);
                 g.setStroke(MOVE_NODE_INTERSECTING_STROKE.get());
-                g.draw(b);
+                g.draw(b.computeClippedLine(g.getStroke()));
             }
 
         }
@@ -478,15 +480,20 @@ public class ImproveWayAccuracyAction extends MapMode implements
                     final List<Node> nodes = newWay.getNodes();
                     nodes.remove(candidateNode);
                     newWay.setNodes(nodes);
-                    Main.main.undoRedo.add(new ChangeCommand(targetWay, newWay));
+                    if (nodes.size() < 2) {
+                        final Command deleteCmd = DeleteCommand.delete(getLayerManager().getEditLayer(), Collections.singleton(targetWay), true);
+                        if (deleteCmd != null) {
+                            Main.main.undoRedo.add(deleteCmd);
+                        }
+                    } else {
+                        Main.main.undoRedo.add(new ChangeCommand(targetWay, newWay));
+                    }
                 } else if (candidateNode.isTagged()) {
                     JOptionPane.showMessageDialog(Main.parent,
                             tr("Cannot delete node that has tags"),
                             tr("Error"), JOptionPane.ERROR_MESSAGE);
                 } else {
-                    List<Node> nodeList = new ArrayList<>();
-                    nodeList.add(candidateNode);
-                    Command deleteCmd = DeleteCommand.delete(getLayerManager().getEditLayer(), nodeList, true);
+                    final Command deleteCmd = DeleteCommand.delete(getLayerManager().getEditLayer(), Collections.singleton(candidateNode), true);
                     if (deleteCmd != null) {
                         Main.main.undoRedo.add(deleteCmd);
                     }
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
index 2b9fa5a..ee93178 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
@@ -470,14 +470,14 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
             MapViewPath line = new MapViewPath(mv);
             line.moveTo(referenceSegment.getFirstNode());
             line.lineTo(referenceSegment.getSecondNode());
-            g.draw(line);
+            g.draw(line.computeClippedLine(g.getStroke()));
 
             g.setStroke(HELPER_LINE_STROKE.get());
             g.setColor(mainColor);
             line = new MapViewPath(mv);
             line.moveTo(helperLineStart);
             line.lineTo(helperLineEnd);
-            g.draw(line);
+            g.draw(line.computeClippedLine(g.getStroke()));
         }
     }
 
diff --git a/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java b/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java
index f01a6b6..a59109d 100644
--- a/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java
@@ -39,7 +39,7 @@ public class SelectMembersAction extends AbstractRelationAction {
 
         Set<OsmPrimitive> members = new HashSet<>();
         for (Relation r: relations) {
-            members.addAll(r.getMemberPrimitives());
+            members.addAll(r.getMemberPrimitivesList());
         }
         if (add) {
             Main.getLayerManager().getEditLayer().data.addSelected(members);
diff --git a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
index 8bf810c..3a12ac9 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
@@ -888,7 +888,9 @@ public class SearchCompiler {
                     this.searchRegex = Pattern.compile(s, regexFlags(caseSensitive));
                 } catch (PatternSyntaxException e) {
                     throw new ParseError(tr(rxErrorMsg, e.getPattern(), e.getIndex(), e.getMessage()), e);
-                } catch (IllegalArgumentException e) {
+                } catch (IllegalArgumentException | StringIndexOutOfBoundsException e) {
+                    // StringIndexOutOfBoundsException catched because of https://bugs.openjdk.java.net/browse/JI-9044959
+                    // See #13870: To remove after we switch to a version of Java which resolves this bug
                     throw new ParseError(tr(rxErrorMsgNoPos, s, e.getMessage()), e);
                 }
                 this.search = s;
diff --git a/src/org/openstreetmap/josm/command/AddCommand.java b/src/org/openstreetmap/josm/command/AddCommand.java
index 0ed62bb..719598c 100644
--- a/src/org/openstreetmap/josm/command/AddCommand.java
+++ b/src/org/openstreetmap/josm/command/AddCommand.java
@@ -36,7 +36,7 @@ public class AddCommand extends Command {
      * @param osm The primitive to add
      */
     public AddCommand(OsmPrimitive osm) {
-        this.osm = osm;
+        this.osm = Objects.requireNonNull(osm, "osm");
     }
 
     /**
@@ -46,7 +46,7 @@ public class AddCommand extends Command {
      */
     public AddCommand(OsmDataLayer layer, OsmPrimitive osm) {
         super(layer);
-        this.osm = osm;
+        this.osm = Objects.requireNonNull(osm, "osm");
     }
 
     protected static final void checkNodeStyles(OsmPrimitive osm) {
diff --git a/src/org/openstreetmap/josm/command/Command.java b/src/org/openstreetmap/josm/command/Command.java
index b510cfb..a2a98c1 100644
--- a/src/org/openstreetmap/josm/command/Command.java
+++ b/src/org/openstreetmap/josm/command/Command.java
@@ -252,12 +252,11 @@ public abstract class Command implements PseudoCommand {
     /**
      * Check whether user is about to operate on data outside of the download area.
      *
-     * @param operation the operation name which is used for setting some preferences
      * @param primitives the primitives to operate on
      * @param ignore {@code null} or a primitive to be ignored
      * @return true, if operating on outlying primitives is OK; false, otherwise
      */
-    public static int checkOutlyingOrIncompleteOperation(String operation,
+    public static int checkOutlyingOrIncompleteOperation(
             Collection<? extends OsmPrimitive> primitives,
             Collection<? extends OsmPrimitive> ignore) {
         int res = 0;
@@ -288,7 +287,7 @@ public abstract class Command implements PseudoCommand {
             String dialogTitle, String outsideDialogMessage, String incompleteDialogMessage,
             Collection<? extends OsmPrimitive> primitives,
             Collection<? extends OsmPrimitive> ignore) {
-        int checkRes = checkOutlyingOrIncompleteOperation(operation, primitives, ignore);
+        int checkRes = checkOutlyingOrIncompleteOperation(primitives, ignore);
         if ((checkRes & IS_OUTSIDE) != 0) {
             JPanel msg = new JPanel(new GridBagLayout());
             msg.add(new JMultilineLabel("<html>" + outsideDialogMessage + "</html>"));
diff --git a/src/org/openstreetmap/josm/command/MoveCommand.java b/src/org/openstreetmap/josm/command/MoveCommand.java
index d4838b4..ff91a2c 100644
--- a/src/org/openstreetmap/josm/command/MoveCommand.java
+++ b/src/org/openstreetmap/josm/command/MoveCommand.java
@@ -92,6 +92,7 @@ public class MoveCommand extends Command {
         saveCheckpoint(); // (0,0) displacement will be saved
         this.x = x;
         this.y = y;
+        Objects.requireNonNull(objects, "objects");
         this.nodes = AllNodesVisitor.getAllNodes(objects);
         for (Node n : this.nodes) {
             oldState.add(new OldNodeState(n));
@@ -105,7 +106,10 @@ public class MoveCommand extends Command {
      * @param end The ending position (northern/eastern)
      */
     public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
-        this(objects, end.getX()-start.getX(), end.getY()-start.getY());
+        this(
+                Objects.requireNonNull(objects, "objects"),
+                Objects.requireNonNull(end, "end").getX() - Objects.requireNonNull(start, "start").getX(),
+                Objects.requireNonNull(end, "end").getY() - Objects.requireNonNull(start, "start").getY());
         startEN = start;
     }
 
@@ -116,7 +120,10 @@ public class MoveCommand extends Command {
      * @param end The ending position (northern/eastern)
      */
     public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) {
-        this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY());
+        this(
+                Collections.singleton(Objects.requireNonNull(p, "p")),
+                Objects.requireNonNull(end, "end").getX() - Objects.requireNonNull(start, "start").getX(),
+                Objects.requireNonNull(end, "end").getY() - Objects.requireNonNull(start, "start").getY());
         startEN = start;
     }
 
diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
index 367281d..d23322c 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
@@ -9,12 +9,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.correction.RoleCorrection;
 import org.openstreetmap.josm.data.correction.TagCorrection;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -63,7 +65,22 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
         }
     }
 
-    private static class StringSwitcher {
+    private interface IStringSwitcher extends Function<String, String> {
+
+        static IStringSwitcher combined(IStringSwitcher... switchers) {
+            return key -> {
+                for (IStringSwitcher switcher : switchers) {
+                    final String newKey = switcher.apply(key);
+                    if (!key.equals(newKey)) {
+                        return newKey;
+                    }
+                }
+                return key;
+            };
+        }
+    }
+
+    private static class StringSwitcher implements IStringSwitcher {
 
         private final String a;
         private final String b;
@@ -75,6 +92,7 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
             this.pattern = getPatternFor(a + '|' + b);
         }
 
+        @Override
         public String apply(String text) {
             Matcher m = pattern.matcher(text);
 
@@ -127,32 +145,20 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
                 } else if (OsmUtils.isTrue(value)) {
                     newValue = OsmUtils.reverseval;
                 }
-                for (StringSwitcher prefixSuffixSwitcher : stringSwitchers) {
-                    newKey = prefixSuffixSwitcher.apply(key);
-                    if (!key.equals(newKey)) {
-                        break;
-                    }
-                }
-            } else if (key.startsWith("incline") || key.endsWith("incline")
-                    || key.startsWith("direction") || key.endsWith("direction")) {
+                newKey = COMBINED_SWITCHERS.apply(key);
+            } else if (key.startsWith("incline") || key.endsWith("incline")) {
                 newValue = UP_DOWN.apply(value);
                 if (newValue.equals(value)) {
                     newValue = invertNumber(value);
                 }
+            } else if (key.startsWith("direction") || key.endsWith("direction")) {
+                newValue = COMBINED_SWITCHERS.apply(value);
             } else if (key.endsWith(":forward") || key.endsWith(":backward")) {
                 // Change key but not left/right value (fix #8518)
                 newKey = FORWARD_BACKWARD.apply(key);
             } else if (!ignoreKeyForCorrection(key)) {
-                for (StringSwitcher prefixSuffixSwitcher : stringSwitchers) {
-                    newKey = prefixSuffixSwitcher.apply(key);
-                    if (!key.equals(newKey)) {
-                        break;
-                    }
-                    newValue = prefixSuffixSwitcher.apply(value);
-                    if (!value.equals(newValue)) {
-                        break;
-                    }
-                }
+                newKey = COMBINED_SWITCHERS.apply(key);
+                newValue = COMBINED_SWITCHERS.apply(value);
             }
             return new Tag(newKey, newValue);
         }
@@ -160,14 +166,13 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
 
     private static final StringSwitcher FORWARD_BACKWARD = new StringSwitcher("forward", "backward");
     private static final StringSwitcher UP_DOWN = new StringSwitcher("up", "down");
-
-    private static final StringSwitcher[] stringSwitchers = new StringSwitcher[] {
+    private static final IStringSwitcher COMBINED_SWITCHERS = IStringSwitcher.combined(
         new StringSwitcher("left", "right"),
         new StringSwitcher("forwards", "backwards"),
         new StringSwitcher("east", "west"),
         new StringSwitcher("north", "south"),
         FORWARD_BACKWARD, UP_DOWN
-    };
+    );
 
     /**
      * Tests whether way can be reversed without semantic change, i.e., whether tags have to be changed.
@@ -206,8 +211,9 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
 
     static List<TagCorrection> getTagCorrections(Tagged way) {
         List<TagCorrection> tagCorrections = new ArrayList<>();
-        for (String key : way.keySet()) {
-            String value = way.get(key);
+        for (Map.Entry<String, String> entry : way.getKeys().entrySet()) {
+            final String key = entry.getKey();
+            final String value = entry.getValue();
             Tag newTag = TagSwitcher.apply(key, value);
             String newKey = newTag.getKey();
             String newValue = newTag.getValue();
@@ -244,17 +250,8 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
                     continue;
                 }
 
-                boolean found = false;
-                String newRole = null;
-                for (StringSwitcher prefixSuffixSwitcher : stringSwitchers) {
-                    newRole = prefixSuffixSwitcher.apply(member.getRole());
-                    if (!newRole.equals(member.getRole())) {
-                        found = true;
-                        break;
-                    }
-                }
-
-                if (found) {
+                final String newRole = COMBINED_SWITCHERS.apply(member.getRole());
+                if (!member.getRole().equals(newRole)) {
                     roleCorrections.add(new RoleCorrection(relation, position, member, newRole));
                 }
 
@@ -264,13 +261,24 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
         return roleCorrections;
     }
 
-    @Override
-    public Collection<Command> execute(Way oldway, Way way) throws UserCancelException {
+    static Map<OsmPrimitive, List<TagCorrection>> getTagCorrectionsMap(Way way) {
         Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap = new HashMap<>();
-        List<TagCorrection> tagCorrections = getTagCorrections(way);
+        List<TagCorrection> tagCorrections = getTagCorrections((Tagged) way);
         if (!tagCorrections.isEmpty()) {
             tagCorrectionsMap.put(way, tagCorrections);
         }
+        for (Node node : way.getNodes()) {
+            final List<TagCorrection> corrections = getTagCorrections(node);
+            if (!corrections.isEmpty()) {
+                tagCorrectionsMap.put(node, corrections);
+            }
+        }
+        return tagCorrectionsMap;
+    }
+
+    @Override
+    public Collection<Command> execute(Way oldway, Way way) throws UserCancelException {
+        Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap = getTagCorrectionsMap(way);
 
         Map<OsmPrimitive, List<RoleCorrection>> roleCorrectionMap = new HashMap<>();
         List<RoleCorrection> roleCorrections = getRoleCorrections(oldway);
diff --git a/src/org/openstreetmap/josm/data/APIDataSet.java b/src/org/openstreetmap/josm/data/APIDataSet.java
index fd33018..3a4531b 100644
--- a/src/org/openstreetmap/josm/data/APIDataSet.java
+++ b/src/org/openstreetmap/josm/data/APIDataSet.java
@@ -11,9 +11,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
-import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.IPrimitive;
@@ -56,6 +57,11 @@ public class APIDataSet {
         init(ds.allPrimitives());
     }
 
+    /**
+     * Initializes the API data set with the modified primitives, ignores unmodified primitives.
+     *
+     * @param primitives the primitives
+     */
     public final void init(Collection<OsmPrimitive> primitives) {
         toAdd.clear();
         toUpdate.clear();
@@ -70,10 +76,11 @@ public class APIDataSet {
                 toDelete.add(osm);
             }
         }
-        OsmPrimitiveComparator c = new OsmPrimitiveComparator(false, true);
-        toDelete.sort(c);
-        toAdd.sort(c);
-        toUpdate.sort(c);
+        final Comparator<OsmPrimitive> orderingNodesWaysRelations = OsmPrimitiveComparator.orderingNodesWaysRelations();
+        final Comparator<OsmPrimitive> byUniqueId = OsmPrimitiveComparator.comparingUniqueId();
+        toAdd.sort(orderingNodesWaysRelations.thenComparing(byUniqueId));
+        toUpdate.sort(orderingNodesWaysRelations.thenComparing(byUniqueId));
+        toDelete.sort(orderingNodesWaysRelations.reversed().thenComparing(byUniqueId));
     }
 
     /**
@@ -88,25 +95,6 @@ public class APIDataSet {
 
     /**
      * Replies true if one of the primitives to be updated or to be deleted
-     * participates in the conflict <code>conflict</code>
-     *
-     * @param conflict the conflict
-     * @return true if one of the primitives to be updated or to be deleted
-     * participates in the conflict <code>conflict</code>
-     */
-    public boolean participatesInConflict(Conflict<?> conflict) {
-        if (conflict == null) return false;
-        for (OsmPrimitive p: toUpdate) {
-            if (conflict.isParticipating(p)) return true;
-        }
-        for (OsmPrimitive p: toDelete) {
-            if (conflict.isParticipating(p)) return true;
-        }
-        return false;
-    }
-
-    /**
-     * Replies true if one of the primitives to be updated or to be deleted
      * participates in at least one conflict in <code>conflicts</code>
      *
      * @param conflicts the collection of conflicts
@@ -115,20 +103,14 @@ public class APIDataSet {
      */
     public boolean participatesInConflict(ConflictCollection conflicts) {
         if (conflicts == null || conflicts.isEmpty()) return false;
-        Set<PrimitiveId> idsParticipatingInConflicts = new HashSet<>();
-        for (OsmPrimitive p: conflicts.getMyConflictParties()) {
-            idsParticipatingInConflicts.add(p.getPrimitiveId());
-        }
-        for (OsmPrimitive p: conflicts.getTheirConflictParties()) {
-            idsParticipatingInConflicts.add(p.getPrimitiveId());
-        }
-        for (OsmPrimitive p: toUpdate) {
-            if (idsParticipatingInConflicts.contains(p.getPrimitiveId())) return true;
-        }
-        for (OsmPrimitive p: toDelete) {
-            if (idsParticipatingInConflicts.contains(p.getPrimitiveId())) return true;
-        }
-        return false;
+        Set<PrimitiveId> idsParticipatingInConflicts = conflicts.get().stream()
+                .flatMap(c -> Stream.of(c.getMy(), c.getTheir()))
+                .map(OsmPrimitive::getPrimitiveId)
+                .collect(Collectors.toSet());
+        return Stream.of(toUpdate, toDelete)
+                .flatMap(Collection::stream)
+                .map(OsmPrimitive::getPrimitiveId)
+                .anyMatch(idsParticipatingInConflicts::contains);
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/data/Data.java b/src/org/openstreetmap/josm/data/Data.java
index 3b51479..0f41d34 100644
--- a/src/org/openstreetmap/josm/data/Data.java
+++ b/src/org/openstreetmap/josm/data/Data.java
@@ -9,6 +9,7 @@ import java.util.List;
  * Generic data, holding data downloaded from various data sources.
  * @since 7575
  */
+ at FunctionalInterface
 public interface Data {
 
     /**
@@ -21,7 +22,9 @@ public interface Data {
      * Returns the total area of downloaded data (the "yellow rectangles").
      * @return Area object encompassing downloaded data.
      */
-    Area getDataSourceArea();
+    default Area getDataSourceArea() {
+        return DataSource.getDataSourceArea(getDataSources());
+    }
 
     /**
      * <p>Replies the list of data source bounds.</p>
@@ -35,5 +38,7 @@ public interface Data {
      * @return the list of data source bounds. An empty list, if no non-null data source
      * bounds are defined.
      */
-    List<Bounds> getDataSourceBounds();
+    default List<Bounds> getDataSourceBounds() {
+        return DataSource.getDataSourceBounds(getDataSources());
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index ec382d8..273602a 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -17,6 +17,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -37,6 +38,7 @@ import java.util.TreeMap;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.json.Json;
@@ -99,6 +101,7 @@ import org.xml.sax.SAXException;
 public class Preferences {
 
     private static final String[] OBSOLETE_PREF_KEYS = {
+      "hdop.factor" /* remove entry after April 2017 */
     };
 
     private static final long MAX_AGE_DEFAULT_PREFERENCES = 60L * 60L * 24L * 50L; // 50 days (in seconds)
@@ -291,6 +294,21 @@ public class Preferences {
     }
 
     /**
+     * Get the base name of the JOSM directories for preferences, cache and
+     * user data.
+     * Default value is "JOSM", unless overridden by system property "josm.dir.name".
+     * @return the base name of the JOSM directories for preferences, cache and
+     * user data
+     */
+    public String getJOSMDirectoryBaseName() {
+        String name = System.getProperty("josm.dir.name");
+        if (name != null)
+            return name;
+        else
+            return "JOSM";
+    }
+
+    /**
      * Returns the user defined preferences directory, containing the preferences.xml file
      * @return The user defined preferences directory, containing the preferences.xml file
      * @since 7834
@@ -1474,7 +1492,7 @@ public class Preferences {
     public String toXML(Collection<Entry<String, Setting<?>>> settings, boolean nopass, boolean defaults) {
         try (
             StringWriter sw = new StringWriter();
-            PreferencesWriter prefWriter = new PreferencesWriter(new PrintWriter(sw), nopass, defaults);
+            PreferencesWriter prefWriter = new PreferencesWriter(new PrintWriter(sw), nopass, defaults)
         ) {
             prefWriter.write(settings);
             sw.flush();
@@ -1525,6 +1543,10 @@ public class Preferences {
         removeUrlFromEntries(loadedVersion, 10063,
                 "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
                 "resource://data/validator/power.mapcss");
+        // drop in March 2017
+        if (loadedVersion < 11058) {
+            migrateOldColorKeys();
+        }
 
         for (String key : OBSOLETE_PREF_KEYS) {
             if (settingsMap.containsKey(key)) {
@@ -1534,6 +1556,25 @@ public class Preferences {
         }
     }
 
+    private void migrateOldColorKeys() {
+        settingsMap.keySet().stream()
+                .filter(key -> key.startsWith("color."))
+                .flatMap(key -> {
+                    final String newKey = ColorProperty.getColorKey(key.substring("color.".length()));
+                    return key.equals(newKey) || settingsMap.containsKey(newKey)
+                            ? Stream.empty()
+                            : Stream.of(new AbstractMap.SimpleImmutableEntry<>(key, newKey));
+                })
+                .collect(Collectors.toList()) // to avoid ConcurrentModificationException
+                .forEach(entry -> {
+                    final String oldKey = entry.getKey();
+                    final String newKey = entry.getValue();
+                    Main.info("Migrating old color key {0} => {1}", oldKey, newKey);
+                    put(newKey, get(oldKey));
+                    put(oldKey, null);
+                });
+    }
+
     private void removeUrlFromEntries(int loadedVersion, int versionMax, String key, String urlPart) {
         if (loadedVersion < versionMax) {
             Setting<?> setting = settingsMap.get(key);
diff --git a/src/org/openstreetmap/josm/data/SystemOfMeasurement.java b/src/org/openstreetmap/josm/data/SystemOfMeasurement.java
index 8e763f8..6e60757 100644
--- a/src/org/openstreetmap/josm/data/SystemOfMeasurement.java
+++ b/src/org/openstreetmap/josm/data/SystemOfMeasurement.java
@@ -41,7 +41,7 @@ public class SystemOfMeasurement {
      * Metric system (international standard).
      * @since 3406
      */
-    public static final SystemOfMeasurement METRIC = new SystemOfMeasurement(1, "m", 1000, "km", "km/h", 3.6, 10000, "ha");
+    public static final SystemOfMeasurement METRIC = new SystemOfMeasurement(1, "m", 1000, "km", "km/h", 3.6, 10_000, "ha");
 
     /**
      * Chinese system.
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
index 216de7a..9cc515c 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
@@ -5,6 +5,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.channels.FileLock;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.logging.Handler;
 import java.util.logging.Level;
@@ -81,6 +82,7 @@ public final class JCSCacheManager {
         jcsLog.setLevel(Level.INFO);
         jcsLog.setUseParentHandlers(false);
         // we need a separate handler from Main's, as we downgrade LEVEL.INFO to DEBUG level
+        Arrays.stream(jcsLog.getHandlers()).forEach(jcsLog::removeHandler);
         jcsLog.addHandler(new Handler() {
             final SimpleFormatter formatter = new SimpleFormatter();
 
diff --git a/src/org/openstreetmap/josm/data/coor/LatLon.java b/src/org/openstreetmap/josm/data/coor/LatLon.java
index f983443..ca75fec 100644
--- a/src/org/openstreetmap/josm/data/coor/LatLon.java
+++ b/src/org/openstreetmap/josm/data/coor/LatLon.java
@@ -14,9 +14,13 @@ import static org.openstreetmap.josm.tools.I18n.trc;
 import java.awt.geom.Area;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.josm.Main;
@@ -81,6 +85,38 @@ public class LatLon extends Coordinate {
     private static final String cDm60 = cDmMinuteFormatter.format(60.0);
     private static final String cDm00 = cDmMinuteFormatter.format(0.0);
 
+    /** Character denoting South, as string */
+    public static final String SOUTH = trc("compass", "S");
+    /** Character denoting North, as string */
+    public static final String NORTH = trc("compass", "N");
+    /** Character denoting West, as string */
+    public static final String WEST = trc("compass", "W");
+    /** Character denoting East, as string */
+    public static final String EAST = trc("compass", "E");
+
+    private static final char N_TR = NORTH.charAt(0);
+    private static final char S_TR = SOUTH.charAt(0);
+    private static final char E_TR = EAST.charAt(0);
+    private static final char W_TR = WEST.charAt(0);
+
+    private static final String DEG = "\u00B0";
+    private static final String MIN = "\u2032";
+    private static final String SEC = "\u2033";
+
+    private static final Pattern P = Pattern.compile(
+            "([+|-]?\\d+[.,]\\d+)|"             // (1)
+            + "([+|-]?\\d+)|"                   // (2)
+            + "("+DEG+"|o|deg)|"                // (3)
+            + "('|"+MIN+"|min)|"                // (4)
+            + "(\"|"+SEC+"|sec)|"               // (5)
+            + "(,|;)|"                          // (6)
+            + "([NSEW"+N_TR+S_TR+E_TR+W_TR+"])|"// (7)
+            + "\\s+|"
+            + "(.+)", Pattern.CASE_INSENSITIVE);
+
+    private static final Pattern P_XML = Pattern.compile(
+            "lat=[\"']([+|-]?\\d+[.,]\\d+)[\"']\\s+lon=[\"']([+|-]?\\d+[.,]\\d+)[\"']");
+
     /**
      * Replies true if lat is in the range [-90,90]
      *
@@ -234,9 +270,6 @@ public class LatLon extends Coordinate {
         return y;
     }
 
-    public static final String SOUTH = trc("compass", "S");
-    public static final String NORTH = trc("compass", "N");
-
     /**
      * Formats the latitude part according to the given format
      * @param d the coordinate format to use
@@ -260,9 +293,6 @@ public class LatLon extends Coordinate {
         return x;
     }
 
-    public static final String WEST = trc("compass", "W");
-    public static final String EAST = trc("compass", "E");
-
     /**
      * Formats the longitude part according to the given format
      * @param d the coordinate format to use
@@ -511,4 +541,140 @@ public class LatLon extends Coordinate {
     public ICoordinate toCoordinate() {
         return new org.openstreetmap.gui.jmapviewer.Coordinate(lat(), lon());
     }
+
+    private static class LatLonHolder {
+        private double lat = Double.NaN;
+        private double lon = Double.NaN;
+    }
+
+    private static void setLatLonObj(final LatLonHolder latLon,
+            final Object coord1deg, final Object coord1min, final Object coord1sec, final Object card1,
+            final Object coord2deg, final Object coord2min, final Object coord2sec, final Object card2) {
+
+        setLatLon(latLon,
+                (Double) coord1deg, (Double) coord1min, (Double) coord1sec, (String) card1,
+                (Double) coord2deg, (Double) coord2min, (Double) coord2sec, (String) card2);
+    }
+
+    private static void setLatLon(final LatLonHolder latLon,
+            final double coord1deg, final double coord1min, final double coord1sec, final String card1,
+            final double coord2deg, final double coord2min, final double coord2sec, final String card2) {
+
+        setLatLon(latLon, coord1deg, coord1min, coord1sec, card1);
+        setLatLon(latLon, coord2deg, coord2min, coord2sec, card2);
+        if (Double.isNaN(latLon.lat) || Double.isNaN(latLon.lon)) {
+            throw new IllegalArgumentException("invalid lat/lon parameters");
+        }
+    }
+
+    private static void setLatLon(final LatLonHolder latLon, final double coordDeg, final double coordMin, final double coordSec,
+            final String card) {
+        if (coordDeg < -180 || coordDeg > 180 || coordMin < 0 || coordMin >= 60 || coordSec < 0 || coordSec > 60) {
+            throw new IllegalArgumentException("out of range");
+        }
+
+        double coord = (coordDeg < 0 ? -1 : 1) * (Math.abs(coordDeg) + coordMin / 60 + coordSec / 3600);
+        coord = "N".equals(card) || "E".equals(card) ? coord : -coord;
+        if ("N".equals(card) || "S".equals(card)) {
+            latLon.lat = coord;
+        } else {
+            latLon.lon = coord;
+        }
+    }
+
+    /**
+     * Parses the given string as lat/lon.
+     * @param coord String to parse
+     * @return parsed lat/lon
+     * @since 11045
+     */
+    public static LatLon parse(String coord) {
+        final LatLonHolder latLon = new LatLonHolder();
+        final Matcher mXml = P_XML.matcher(coord);
+        if (mXml.matches()) {
+            setLatLonObj(latLon,
+                    Double.valueOf(mXml.group(1).replace(',', '.')), 0.0, 0.0, "N",
+                    Double.valueOf(mXml.group(2).replace(',', '.')), 0.0, 0.0, "E");
+        } else {
+            final Matcher m = P.matcher(coord);
+
+            final StringBuilder sb = new StringBuilder();
+            final List<Object> list = new ArrayList<>();
+
+            while (m.find()) {
+                if (m.group(1) != null) {
+                    sb.append('R');     // floating point number
+                    list.add(Double.valueOf(m.group(1).replace(',', '.')));
+                } else if (m.group(2) != null) {
+                    sb.append('Z');     // integer number
+                    list.add(Double.valueOf(m.group(2)));
+                } else if (m.group(3) != null) {
+                    sb.append('o');     // degree sign
+                } else if (m.group(4) != null) {
+                    sb.append('\'');    // seconds sign
+                } else if (m.group(5) != null) {
+                    sb.append('"');     // minutes sign
+                } else if (m.group(6) != null) {
+                    sb.append(',');     // separator
+                } else if (m.group(7) != null) {
+                    sb.append('x');     // cardinal direction
+                    String c = m.group(7).toUpperCase(Locale.ENGLISH);
+                    if ("N".equalsIgnoreCase(c) || "S".equalsIgnoreCase(c) || "E".equalsIgnoreCase(c) || "W".equalsIgnoreCase(c)) {
+                        list.add(c);
+                    } else {
+                        list.add(c.replace(N_TR, 'N').replace(S_TR, 'S')
+                                  .replace(E_TR, 'E').replace(W_TR, 'W'));
+                    }
+                } else if (m.group(8) != null) {
+                    throw new IllegalArgumentException("invalid token: " + m.group(8));
+                }
+            }
+
+            final String pattern = sb.toString();
+
+            final Object[] params = list.toArray();
+
+            if (pattern.matches("Ro?,?Ro?")) {
+                setLatLonObj(latLon,
+                        params[0], 0.0, 0.0, "N",
+                        params[1], 0.0, 0.0, "E");
+            } else if (pattern.matches("xRo?,?xRo?")) {
+                setLatLonObj(latLon,
+                        params[1], 0.0, 0.0, params[0],
+                        params[3], 0.0, 0.0, params[2]);
+            } else if (pattern.matches("Ro?x,?Ro?x")) {
+                setLatLonObj(latLon,
+                        params[0], 0.0, 0.0, params[1],
+                        params[2], 0.0, 0.0, params[3]);
+            } else if (pattern.matches("Zo[RZ]'?,?Zo[RZ]'?|Z[RZ],?Z[RZ]")) {
+                setLatLonObj(latLon,
+                        params[0], params[1], 0.0, "N",
+                        params[2], params[3], 0.0, "E");
+            } else if (pattern.matches("xZo[RZ]'?,?xZo[RZ]'?|xZo?[RZ],?xZo?[RZ]")) {
+                setLatLonObj(latLon,
+                        params[1], params[2], 0.0, params[0],
+                        params[4], params[5], 0.0, params[3]);
+            } else if (pattern.matches("Zo[RZ]'?x,?Zo[RZ]'?x|Zo?[RZ]x,?Zo?[RZ]x")) {
+                setLatLonObj(latLon,
+                        params[0], params[1], 0.0, params[2],
+                        params[3], params[4], 0.0, params[5]);
+            } else if (pattern.matches("ZoZ'[RZ]\"?x,?ZoZ'[RZ]\"?x|ZZ[RZ]x,?ZZ[RZ]x")) {
+                setLatLonObj(latLon,
+                        params[0], params[1], params[2], params[3],
+                        params[4], params[5], params[6], params[7]);
+            } else if (pattern.matches("xZoZ'[RZ]\"?,?xZoZ'[RZ]\"?|xZZ[RZ],?xZZ[RZ]")) {
+                setLatLonObj(latLon,
+                        params[1], params[2], params[3], params[0],
+                        params[5], params[6], params[7], params[4]);
+            } else if (pattern.matches("ZZ[RZ],?ZZ[RZ]")) {
+                setLatLonObj(latLon,
+                        params[0], params[1], params[2], "N",
+                        params[3], params[4], params[5], "E");
+            } else {
+                throw new IllegalArgumentException("invalid format: " + pattern);
+            }
+        }
+
+        return new LatLon(latLon.lat, latLon.lon);
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/coor/QuadTiling.java b/src/org/openstreetmap/josm/data/coor/QuadTiling.java
index afd8fa5..40475e5 100644
--- a/src/org/openstreetmap/josm/data/coor/QuadTiling.java
+++ b/src/org/openstreetmap/josm/data/coor/QuadTiling.java
@@ -48,19 +48,6 @@ public final class QuadTiling {
         return new LatLon(y, x);
     }
 
-    static long xy2tile(long x, long y) {
-        long tile = 0;
-        int i;
-        for (i = NR_LEVELS-1; i >= 0; i--) {
-            long xbit = (x >> i) & 1;
-            long ybit = (y >> i) & 1;
-            tile <<= 2;
-            // Note that x is the MSB
-            tile |= (xbit << 1) | ybit;
-        }
-        return tile;
-    }
-
     static long lon2x(double lon) {
         long ret = (long) ((lon + 180.0) * WORLD_PARTS / 360.0);
         if (Utils.equalsEpsilon(ret, WORLD_PARTS)) {
@@ -77,34 +64,6 @@ public final class QuadTiling {
         return ret;
     }
 
-    public static long quadTile(LatLon coor) {
-        return xy2tile(lon2x(coor.lon()), lat2y(coor.lat()));
-    }
-
-    public static int index(int level, long quad) {
-        long mask = 0x00000003;
-        int totalShift = TILES_PER_LEVEL_SHIFT*(NR_LEVELS-level-1);
-        return (int) (mask & (quad >> totalShift));
-    }
-
-    /**
-     * Returns quad tiling index for given coordinates and level.
-     *
-     * @param coor coordinates
-     * @param level level
-     *
-     * @return quad tiling index for given coordinates and level.
-     * @since 2263
-     */
-    public static int index(LatLon coor, int level) {
-        // The nodes that don't return coordinates will all get stuck in a single tile.
-        // Hopefully there are not too many of them
-        if (coor == null)
-            return 0;
-
-        return index(coor.lat(), coor.lon(), level);
-    }
-
     /**
      * Returns quad tiling index for given coordinates and level.
      *
diff --git a/src/org/openstreetmap/josm/data/correction/TagCorrection.java b/src/org/openstreetmap/josm/data/correction/TagCorrection.java
index bd41bc3..8a6ba95 100644
--- a/src/org/openstreetmap/josm/data/correction/TagCorrection.java
+++ b/src/org/openstreetmap/josm/data/correction/TagCorrection.java
@@ -1,6 +1,8 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.correction;
 
+import java.util.Objects;
+
 /**
  * Represents a change of a single tag.
  * Both key and value can be subject of this change.
@@ -46,4 +48,21 @@ public class TagCorrection implements Correction {
     public boolean isValueChanged() {
         return !newValue.equals(oldValue);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        TagCorrection that = (TagCorrection) o;
+        return Objects.equals(oldKey, that.oldKey) &&
+               Objects.equals(newKey, that.newKey) &&
+               Objects.equals(oldValue, that.oldValue) &&
+               Objects.equals(newValue, that.newValue);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(oldKey, newKey, oldValue, newValue);
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxData.java b/src/org/openstreetmap/josm/data/gpx/GpxData.java
index d46679b..1d2a4c6 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxData.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxData.java
@@ -1,14 +1,13 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.gpx;
 
-import java.awt.geom.Area;
 import java.io.File;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
@@ -469,17 +468,7 @@ public class GpxData extends WithAttributes implements Data {
 
     @Override
     public Collection<DataSource> getDataSources() {
-        return dataSources;
-    }
-
-    @Override
-    public Area getDataSourceArea() {
-        return DataSource.getDataSourceArea(dataSources);
-    }
-
-    @Override
-    public List<Bounds> getDataSourceBounds() {
-        return DataSource.getDataSourceBounds(dataSources);
+        return Collections.unmodifiableCollection(dataSources);
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java b/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
new file mode 100644
index 0000000..cbc5723
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
@@ -0,0 +1,184 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.imagery;
+
+import java.awt.Point;
+
+import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.TileXY;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Projection;
+
+/**
+ * Base class for different WMS tile sources those based on URL templates and those based on WMS endpoints
+ * @author Wiktor Niesiobędzki
+ * @since 10990
+ */
+public abstract class AbstractWMSTileSource extends TMSTileSource {
+
+    private EastNorth anchorPosition;
+    private int[] tileXMin;
+    private int[] tileYMin;
+    private int[] tileXMax;
+    private int[] tileYMax;
+    private double[] degreesPerTile;
+    private static final float SCALE_DENOMINATOR_ZOOM_LEVEL_1 = 559082264.0287178f;
+
+    /**
+     * Constructs a new {@code AbstractWMSTileSource}.
+     * @param info tile source info
+     */
+    public AbstractWMSTileSource(TileSourceInfo info) {
+        super(info);
+    }
+
+    private void initAnchorPosition(Projection proj) {
+        Bounds worldBounds = proj.getWorldBoundsLatLon();
+        EastNorth min = proj.latlon2eastNorth(worldBounds.getMin());
+        EastNorth max = proj.latlon2eastNorth(worldBounds.getMax());
+        this.anchorPosition = new EastNorth(min.east(), max.north());
+    }
+
+    /**
+     * Initializes class with current projection in JOSM. This call is needed every time projection changes.
+     */
+    public void initProjection() {
+        initProjection(Main.getProjection());
+    }
+
+    /**
+     * Initializes class with projection in JOSM. This call is needed every time projection changes.
+     * @param proj new projection that shall be used for computations
+     */
+    public void initProjection(Projection proj) {
+        initAnchorPosition(proj);
+        ProjectionBounds worldBounds = proj.getWorldBoundsBoxEastNorth();
+
+        EastNorth topLeft = new EastNorth(worldBounds.getMin().east(), worldBounds.getMax().north());
+        EastNorth bottomRight = new EastNorth(worldBounds.getMax().east(), worldBounds.getMin().north());
+
+        // use 256 as "tile size" to keep the scale in line with default tiles in Mercator projection
+        double crsScale = 256 * 0.28e-03 / proj.getMetersPerUnit();
+        tileXMin = new int[getMaxZoom() + 1];
+        tileYMin = new int[getMaxZoom() + 1];
+        tileXMax = new int[getMaxZoom() + 1];
+        tileYMax = new int[getMaxZoom() + 1];
+        degreesPerTile = new double[getMaxZoom() + 1];
+
+        for (int zoom = 1; zoom <= getMaxZoom(); zoom++) {
+            // use well known scale set "GoogleCompatibile" from OGC WMTS spec to calculate number of tiles per zoom level
+            // this makes the zoom levels "glued" to standard TMS zoom levels
+            degreesPerTile[zoom] = (SCALE_DENOMINATOR_ZOOM_LEVEL_1 / Math.pow(2d, zoom - 1d)) * crsScale;
+            TileXY minTileIndex = eastNorthToTileXY(topLeft, zoom);
+            tileXMin[zoom] = minTileIndex.getXIndex();
+            tileYMin[zoom] = minTileIndex.getYIndex();
+            TileXY maxTileIndex = eastNorthToTileXY(bottomRight, zoom);
+            tileXMax[zoom] = maxTileIndex.getXIndex();
+            tileYMax[zoom] = maxTileIndex.getYIndex();
+        }
+    }
+
+    @Override
+    public ICoordinate tileXYToLatLon(Tile tile) {
+        return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom());
+    }
+
+    @Override
+    public ICoordinate tileXYToLatLon(TileXY xy, int zoom) {
+        return tileXYToLatLon(xy.getXIndex(), xy.getYIndex(), zoom);
+    }
+
+    @Override
+    public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
+        return Main.getProjection().eastNorth2latlon(getTileEastNorth(x, y, zoom)).toCoordinate();
+    }
+
+    private TileXY eastNorthToTileXY(EastNorth enPoint, int zoom) {
+        double scale = getDegreesPerTile(zoom);
+        return new TileXY(
+                (enPoint.east() - anchorPosition.east()) / scale,
+                (anchorPosition.north() - enPoint.north()) / scale
+                );
+    }
+
+    @Override
+    public TileXY latLonToTileXY(double lat, double lon, int zoom) {
+        EastNorth enPoint = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon));
+        return eastNorthToTileXY(enPoint, zoom);
+    }
+
+    @Override
+    public TileXY latLonToTileXY(ICoordinate point, int zoom) {
+        return latLonToTileXY(point.getLat(), point.getLon(), zoom);
+    }
+
+    @Override
+    public int getTileXMax(int zoom) {
+        return tileXMax[zoom];
+    }
+
+    @Override
+    public int getTileXMin(int zoom) {
+        return tileXMin[zoom];
+    }
+
+    @Override
+    public int getTileYMax(int zoom) {
+        return tileYMax[zoom];
+    }
+
+    @Override
+    public int getTileYMin(int zoom) {
+        return tileYMin[zoom];
+    }
+
+    @Override
+    public Point latLonToXY(double lat, double lon, int zoom) {
+        double scale = getDegreesPerTile(zoom) / getTileSize();
+        EastNorth point = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon));
+        return new Point(
+                (int) Math.round((point.east() - anchorPosition.east()) / scale),
+                (int) Math.round((anchorPosition.north() - point.north()) / scale)
+                );
+    }
+
+    @Override
+    public Point latLonToXY(ICoordinate point, int zoom) {
+        return latLonToXY(point.getLat(), point.getLon(), zoom);
+    }
+
+    @Override
+    public ICoordinate xyToLatLon(Point point, int zoom) {
+        return xyToLatLon(point.x, point.y, zoom);
+    }
+
+    @Override
+    public ICoordinate xyToLatLon(int x, int y, int zoom) {
+        double scale = getDegreesPerTile(zoom) / getTileSize();
+        Projection proj = Main.getProjection();
+        EastNorth ret = new EastNorth(
+                anchorPosition.east() + x * scale,
+                anchorPosition.north() - y * scale
+                );
+        return proj.eastNorth2latlon(ret).toCoordinate();
+    }
+
+    protected EastNorth getTileEastNorth(int x, int y, int z) {
+        double scale = getDegreesPerTile(z);
+        return new EastNorth(
+                anchorPosition.east() + x * scale,
+                anchorPosition.north() - y * scale
+                );
+    }
+
+    private double getDegreesPerTile(int zoom) {
+        return degreesPerTile[zoom];
+    }
+
+}
diff --git a/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java b/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
index d648aa7..b1c438b 100644
--- a/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
+++ b/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
@@ -13,6 +13,7 @@ import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.preferences.StringProperty;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
  * TileLoaderFactory creating JCS cached TileLoaders
@@ -34,6 +35,7 @@ public class CachedTileLoaderFactory implements TileLoaderFactory {
      * @throws IllegalArgumentException if a suitable constructor cannot be found for {@code tileLoaderClass}
      */
     public CachedTileLoaderFactory(ICacheAccess<String, BufferedImageCacheEntry> cache, Class<? extends TileLoader> tileLoaderClass) {
+        CheckParameterUtil.ensureParameterNotNull(cache, "cache");
         this.cache = cache;
         try {
             tileLoaderConstructor = tileLoaderClass.getConstructor(
diff --git a/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java b/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
new file mode 100644
index 0000000..f8e1e8e
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
@@ -0,0 +1,213 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.imagery;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Helper class for handling OGC GetCapabilities documents
+ *
+ */
+public final class GetCapabilitiesParseHelper {
+    enum TransferMode {
+        KVP("KVP"),
+        REST("RESTful");
+
+        private final String typeString;
+
+        TransferMode(String urlString) {
+            this.typeString = urlString;
+        }
+
+        private String getTypeString() {
+            return typeString;
+        }
+
+        static TransferMode fromString(String s) {
+            for (TransferMode type : TransferMode.values()) {
+                if (type.getTypeString().equals(s)) {
+                    return type;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * OWS namespace address
+     */
+    public static final String OWS_NS_URL = "http://www.opengis.net/ows/1.1";
+    /**
+     * XML xlink namespace address
+     */
+    public static final String XLINK_NS_URL = "http://www.w3.org/1999/xlink";
+
+    /**
+     * QNames in OWS namespace
+     */
+    // CHECKSTYLE.OFF: SingleSpaceSeparator
+    static final QName QN_OWS_ALLOWED_VALUES      = new QName(OWS_NS_URL, "AllowedValues");
+    static final QName QN_OWS_CONSTRAINT          = new QName(OWS_NS_URL, "Constraint");
+    static final QName QN_OWS_DCP                 = new QName(OWS_NS_URL, "DCP");
+    static final QName QN_OWS_GET                 = new QName(OWS_NS_URL, "Get");
+    static final QName QN_OWS_HTTP                = new QName(OWS_NS_URL, "HTTP");
+    static final QName QN_OWS_IDENTIFIER          = new QName(OWS_NS_URL, "Identifier");
+    static final QName QN_OWS_OPERATION           = new QName(OWS_NS_URL, "Operation");
+    static final QName QN_OWS_OPERATIONS_METADATA = new QName(OWS_NS_URL, "OperationsMetadata");
+    static final QName QN_OWS_SUPPORTED_CRS       = new QName(OWS_NS_URL, "SupportedCRS");
+    static final QName QN_OWS_VALUE               = new QName(OWS_NS_URL, "Value");
+    // CHECKSTYLE.ON: SingleSpaceSeparator
+
+    private GetCapabilitiesParseHelper() {
+        // Hide default constructor for utilities classes
+    }
+
+    /**
+     * @param in InputStream with pointing to GetCapabilities XML stream
+     * @return safe XMLStreamReader, that is not validating external entities, nor loads DTD's
+     * @throws IOException if any I/O error occurs
+     * @throws XMLStreamException if any XML stream error occurs
+     */
+    public static XMLStreamReader getReader(InputStream in) throws IOException, XMLStreamException {
+        XMLInputFactory factory = XMLInputFactory.newFactory();
+        // do not try to load external entities, nor validate the XML
+        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
+        return factory.createXMLStreamReader(in);
+    }
+
+    /**
+     * Moves the reader to the closing tag of current tag.
+     * @param reader XMLStreamReader which should be moved
+     * @throws XMLStreamException when parse exception occurs
+     */
+    public static void moveReaderToEndCurrentTag(XMLStreamReader reader) throws XMLStreamException {
+        int level = 0;
+        QName tag = reader.getName();
+        for (int event = reader.getEventType(); reader.hasNext(); event = reader.next()) {
+            if (XMLStreamReader.START_ELEMENT == event) {
+                level += 1;
+            } else if (XMLStreamReader.END_ELEMENT == event) {
+                level -= 1;
+                if (level == 0 && tag.equals(reader.getName())) {
+                    return;
+                }
+            }
+            if (level < 0) {
+                throw new IllegalStateException("WMTS Parser error - moveReaderToEndCurrentTag failed to find closing tag");
+            }
+        }
+        throw new IllegalStateException("WMTS Parser error - moveReaderToEndCurrentTag failed to find closing tag");
+    }
+
+    /**
+     * Moves reader to first occurrence of the structure equivalent of Xpath tags[0]/tags[1]../tags[n]. If fails to find
+     * moves the reader to the closing tag of current tag
+     *
+     * @param tags array of tags
+     * @param reader XMLStreamReader which should be moved
+     * @return true if tag was found, false otherwise
+     * @throws XMLStreamException See {@link XMLStreamReader}
+     */
+    public static boolean moveReaderToTag(XMLStreamReader reader, QName ... tags) throws XMLStreamException {
+        QName stopTag = reader.getName();
+        int currentLevel = 0;
+        QName searchTag = tags[currentLevel];
+        QName parentTag = null;
+        QName skipTag = null;
+
+        for (int event = 0; //skip current element, so we will not skip it as a whole
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && stopTag.equals(reader.getName()));
+                event = reader.next()) {
+            if (event == XMLStreamReader.END_ELEMENT && skipTag != null && skipTag.equals(reader.getName())) {
+                skipTag = null;
+            }
+            if (skipTag == null) {
+                if (event == XMLStreamReader.START_ELEMENT) {
+                    if (searchTag.equals(reader.getName())) {
+                        currentLevel += 1;
+                        if (currentLevel >= tags.length) {
+                            return true; // found!
+                        }
+                        parentTag = searchTag;
+                        searchTag = tags[currentLevel];
+                    } else {
+                        skipTag = reader.getName();
+                    }
+                }
+
+                if (event == XMLStreamReader.END_ELEMENT && parentTag != null && parentTag.equals(reader.getName())) {
+                    currentLevel -= 1;
+                    searchTag = parentTag;
+                    if (currentLevel >= 0) {
+                        parentTag = tags[currentLevel];
+                    } else {
+                        parentTag = null;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Parses Operation[@name='GetTile']/DCP/HTTP/Get section. Returns when reader is on Get closing tag.
+     * @param reader StAX reader instance
+     * @return TransferMode coded in this section
+     * @throws XMLStreamException See {@link XMLStreamReader}
+     */
+    public static TransferMode getTransferMode(XMLStreamReader reader) throws XMLStreamException {
+        QName getQname = QN_OWS_GET;
+
+        Utils.ensure(getQname.equals(reader.getName()), "WMTS Parser state invalid. Expected element %s, got %s",
+                getQname, reader.getName());
+        for (int event = reader.getEventType();
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && getQname.equals(reader.getName()));
+                event = reader.next()) {
+            if (event == XMLStreamReader.START_ELEMENT && QN_OWS_CONSTRAINT.equals(reader.getName())
+             && "GetEncoding".equals(reader.getAttributeValue("", "name"))) {
+                moveReaderToTag(reader, new QName[]{
+                        QN_OWS_ALLOWED_VALUES,
+                        QN_OWS_VALUE
+                });
+                return TransferMode.fromString(reader.getElementText());
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param url URL
+     * @return normalized URL
+     * @throws MalformedURLException in case of malformed URL
+     * @since 10993
+     */
+    public static String normalizeCapabilitiesUrl(String url) throws MalformedURLException {
+        URL inUrl = new URL(url);
+        URL ret = new URL(inUrl.getProtocol(), inUrl.getHost(), inUrl.getPort(), inUrl.getFile());
+        return ret.toExternalForm();
+    }
+
+    /**
+     * Convert CRS identifier to plain code
+     * @param crsIdentifier CRS identifier
+     * @return CRS Identifier as it is used within JOSM (without prefix)
+     */
+    public static String crsToCode(String crsIdentifier) {
+        if (crsIdentifier.startsWith("urn:ogc:def:crs:")) {
+            return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*):.*:(.*)$", "$1:$2");
+        }
+        return crsIdentifier;
+    }
+
+}
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index 540d332..3c277fe 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -16,6 +16,7 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import javax.swing.ImageIcon;
 
@@ -192,6 +193,8 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
     private String icon;
     private boolean isGeoreferenceValid;
     private boolean isEpsg4326To3857Supported;
+    /** which layers should be activated by default on layer addition. **/
+    private Collection<String> defaultLayers = Collections.emptyList();
     // when adding a field, also adapt the ImageryInfo(ImageryInfo)
     // and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry
 
@@ -226,6 +229,8 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
         @pref Map<String, String> metadataHeaders;
         @pref boolean valid_georeference;
         @pref boolean supports_epsg_4326_to_3857_conversion;
+        // TODO: disabled until change of layers is implemented
+        // @pref String default_layers;
 
         /**
          * Constructs a new empty WMS {@code ImageryPreferenceEntry}.
@@ -270,16 +275,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
                     shapes = shapesString.toString();
                 }
             }
-            if (!i.serverProjections.isEmpty()) {
-                StringBuilder val = new StringBuilder();
-                for (String p : i.serverProjections) {
-                    if (val.length() > 0) {
-                        val.append(',');
-                    }
-                    val.append(p);
-                }
-                projections = val.toString();
-            }
+            projections = i.serverProjections.stream().collect(Collectors.joining(","));
             if (i.noTileHeaders != null && !i.noTileHeaders.isEmpty()) {
                 noTileHeaders = new MultiMap<>(i.noTileHeaders);
             }
@@ -296,6 +292,8 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
 
             valid_georeference = i.isGeoreferenceValid();
             supports_epsg_4326_to_3857_conversion = i.isEpsg4326To3857Supported();
+            // TODO disabled until change of layers is implemented
+            // default_layers = i.defaultLayers.stream().collect(Collectors.joining(","));
         }
 
         @Override
@@ -422,6 +420,8 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
         metadataHeaders = e.metadataHeaders;
         isEpsg4326To3857Supported = e.supports_epsg_4326_to_3857_conversion;
         isGeoreferenceValid = e.valid_georeference;
+        // TODO disabled until change of layers is implemented
+        // defaultLayers = Arrays.asList(e.default_layers.split(","));
     }
 
     /**
@@ -453,6 +453,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
         this.metadataHeaders = i.metadataHeaders;
         this.isEpsg4326To3857Supported = i.isEpsg4326To3857Supported;
         this.isGeoreferenceValid = i.isGeoreferenceValid;
+        this.defaultLayers = i.defaultLayers;
     }
 
     @Override
@@ -496,7 +497,8 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
                 Objects.equals(this.description, other.description) &&
                 Objects.equals(this.noTileHeaders, other.noTileHeaders) &&
                 Objects.equals(this.noTileChecksums, other.noTileChecksums) &&
-                Objects.equals(this.metadataHeaders, other.metadataHeaders);
+                Objects.equals(this.metadataHeaders, other.metadataHeaders) &&
+                Objects.equals(this.defaultLayers, other.defaultLayers);
     }
 
     @Override
@@ -1146,4 +1148,22 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
        }
        return l;
     }
+
+    /**
+     * Returns default layers that should be shown for this Imagery (if at all supported by imagery provider)
+     * If no layer is set to default and there is more than one imagery available, then user will be asked to choose the layer
+     * to work on
+     * @return Collection of the layer names
+     */
+    public Collection<String> getDefaultLayers() {
+        return defaultLayers;
+    }
+
+    /**
+     * Sets the default layers that user will work with
+     * @param layers set the list of default layers
+     */
+    public void setDefaultLayers(Collection<String> layers) {
+        this.defaultLayers = layers;
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java b/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
index 0d826ae..e227371 100644
--- a/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.data.imagery;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Point;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
@@ -15,17 +14,10 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.openstreetmap.gui.jmapviewer.Tile;
-import org.openstreetmap.gui.jmapviewer.TileXY;
-import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -35,16 +27,9 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
  * @author Wiktor Niesiobędzki
  * @since 8526
  */
-public class TemplatedWMSTileSource extends TMSTileSource implements TemplatedTileSource {
+public class TemplatedWMSTileSource extends AbstractWMSTileSource implements TemplatedTileSource {
     private final Map<String, String> headers = new ConcurrentHashMap<>();
     private final Set<String> serverProjections;
-    private EastNorth anchorPosition;
-    private int[] tileXMin;
-    private int[] tileYMin;
-    private int[] tileXMax;
-    private int[] tileYMax;
-    private double[] degreesPerTile;
-
     // CHECKSTYLE.OFF: SingleSpaceSeparator
     private static final Pattern PATTERN_HEADER = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}");
     private static final Pattern PATTERN_PROJ   = Pattern.compile("\\{proj\\}");
@@ -65,14 +50,6 @@ public class TemplatedWMSTileSource extends TMSTileSource implements TemplatedTi
         PATTERN_HEADER, PATTERN_PROJ, PATTERN_WKID, PATTERN_BBOX, PATTERN_W, PATTERN_S, PATTERN_E, PATTERN_N, PATTERN_WIDTH, PATTERN_HEIGHT
     };
 
-    /*
-     * Constant taken from OGC WMTS Implementation Specification (http://www.opengeospatial.org/standards/wmts)
-     * From table E.4 - Definition of Well-known scale set GoogleMapsCompatibile
-     *
-     *  As higher zoom levels have denominator divided by 2, we keep only zoom level 1 in the code
-     */
-    private static final float SCALE_DENOMINATOR_ZOOM_LEVEL_1 = 559082264.0287178f;
-
     /**
      * Creates a tile source based on imagery info
      * @param info imagery info
@@ -84,52 +61,6 @@ public class TemplatedWMSTileSource extends TMSTileSource implements TemplatedTi
         initProjection();
     }
 
-    /**
-     * Initializes class with current projection in JOSM. This call is needed every time projection changes.
-     */
-    public void initProjection() {
-        initProjection(Main.getProjection());
-    }
-
-    private void initAnchorPosition(Projection proj) {
-        Bounds worldBounds = proj.getWorldBoundsLatLon();
-        EastNorth min = proj.latlon2eastNorth(worldBounds.getMin());
-        EastNorth max = proj.latlon2eastNorth(worldBounds.getMax());
-        this.anchorPosition = new EastNorth(min.east(), max.north());
-    }
-
-    /**
-     * Initializes class with projection in JOSM. This call is needed every time projection changes.
-     * @param proj new projection that shall be used for computations
-     */
-    public void initProjection(Projection proj) {
-        initAnchorPosition(proj);
-        ProjectionBounds worldBounds = proj.getWorldBoundsBoxEastNorth();
-
-        EastNorth topLeft = new EastNorth(worldBounds.getMin().east(), worldBounds.getMax().north());
-        EastNorth bottomRight = new EastNorth(worldBounds.getMax().east(), worldBounds.getMin().north());
-
-        // use 256 as "tile size" to keep the scale in line with default tiles in Mercator projection
-        double crsScale = 256 * 0.28e-03 / proj.getMetersPerUnit();
-        tileXMin = new int[getMaxZoom() + 1];
-        tileYMin = new int[getMaxZoom() + 1];
-        tileXMax = new int[getMaxZoom() + 1];
-        tileYMax = new int[getMaxZoom() + 1];
-        degreesPerTile = new double[getMaxZoom() + 1];
-
-        for (int zoom = 1; zoom <= getMaxZoom(); zoom++) {
-            // use well known scale set "GoogleCompatibile" from OGC WMTS spec to calculate number of tiles per zoom level
-            // this makes the zoom levels "glued" to standard TMS zoom levels
-            degreesPerTile[zoom] = (SCALE_DENOMINATOR_ZOOM_LEVEL_1 / Math.pow(2d, zoom - 1d)) * crsScale;
-            TileXY minTileIndex = eastNorthToTileXY(topLeft, zoom);
-            tileXMin[zoom] = minTileIndex.getXIndex();
-            tileYMin[zoom] = minTileIndex.getYIndex();
-            TileXY maxTileIndex = eastNorthToTileXY(bottomRight, zoom);
-            tileXMax[zoom] = maxTileIndex.getXIndex();
-            tileYMax[zoom] = maxTileIndex.getYIndex();
-        }
-    }
-
     @Override
     public int getDefaultTileSize() {
         return WMSLayer.PROP_IMAGE_SIZE.get();
@@ -239,92 +170,6 @@ public class TemplatedWMSTileSource extends TMSTileSource implements TemplatedTi
     }
 
     @Override
-    public ICoordinate tileXYToLatLon(Tile tile) {
-        return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom());
-    }
-
-    @Override
-    public ICoordinate tileXYToLatLon(TileXY xy, int zoom) {
-        return tileXYToLatLon(xy.getXIndex(), xy.getYIndex(), zoom);
-    }
-
-    @Override
-    public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
-        return Main.getProjection().eastNorth2latlon(getTileEastNorth(x, y, zoom)).toCoordinate();
-    }
-
-    @Override
-    public TileXY latLonToTileXY(double lat, double lon, int zoom) {
-        Projection proj = Main.getProjection();
-        EastNorth enPoint = proj.latlon2eastNorth(new LatLon(lat, lon));
-        return eastNorthToTileXY(enPoint, zoom);
-    }
-
-    private TileXY eastNorthToTileXY(EastNorth enPoint, int zoom) {
-        double scale = getDegreesPerTile(zoom);
-        return new TileXY(
-                (enPoint.east() - anchorPosition.east()) / scale,
-                (anchorPosition.north() - enPoint.north()) / scale
-                );
-    }
-
-    @Override
-    public TileXY latLonToTileXY(ICoordinate point, int zoom) {
-        return latLonToTileXY(point.getLat(), point.getLon(), zoom);
-    }
-
-    @Override
-    public int getTileXMax(int zoom) {
-        return tileXMax[zoom];
-    }
-
-    @Override
-    public int getTileXMin(int zoom) {
-        return tileXMin[zoom];
-    }
-
-    @Override
-    public int getTileYMax(int zoom) {
-        return tileYMax[zoom];
-    }
-
-    @Override
-    public int getTileYMin(int zoom) {
-        return tileYMin[zoom];
-    }
-
-    @Override
-    public Point latLonToXY(double lat, double lon, int zoom) {
-        double scale = getDegreesPerTile(zoom) / getTileSize();
-        EastNorth point = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon));
-        return new Point(
-                    (int) Math.round((point.east() - anchorPosition.east()) / scale),
-                    (int) Math.round((anchorPosition.north() - point.north()) / scale)
-                );
-    }
-
-    @Override
-    public Point latLonToXY(ICoordinate point, int zoom) {
-        return latLonToXY(point.getLat(), point.getLon(), zoom);
-    }
-
-    @Override
-    public ICoordinate xyToLatLon(Point point, int zoom) {
-        return xyToLatLon(point.x, point.y, zoom);
-    }
-
-    @Override
-    public ICoordinate xyToLatLon(int x, int y, int zoom) {
-        double scale = getDegreesPerTile(zoom) / getTileSize();
-        Projection proj = Main.getProjection();
-        EastNorth ret = new EastNorth(
-                anchorPosition.east() + x * scale,
-                anchorPosition.north() - y * scale
-                );
-        return proj.eastNorth2latlon(ret).toCoordinate();
-    }
-
-    @Override
     public Map<String, String> getHeaders() {
         return headers;
     }
@@ -362,16 +207,4 @@ public class TemplatedWMSTileSource extends TMSTileSource implements TemplatedTi
         matcher.appendTail(output);
         this.baseUrl = output.toString();
     }
-
-    protected EastNorth getTileEastNorth(int x, int y, int z) {
-        double scale = getDegreesPerTile(z);
-        return new EastNorth(
-                        anchorPosition.east() + x * scale,
-                        anchorPosition.north() - y * scale
-                        );
-    }
-
-    private double getDegreesPerTile(int zoom) {
-        return degreesPerTile[zoom];
-    }
 }
diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
index af57cac..8cd4ad5 100644
--- a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
@@ -8,14 +8,14 @@ import java.awt.Point;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.Stack;
@@ -23,6 +23,7 @@ import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -30,7 +31,6 @@ import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.table.AbstractTableModel;
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
@@ -59,6 +59,28 @@ import org.openstreetmap.josm.tools.Utils;
  * @since 8526
  */
 public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTileSource {
+    /**
+     * WMTS namespace address
+     */
+    public static final String WMTS_NS_URL = "http://www.opengis.net/wmts/1.0";
+
+    // CHECKSTYLE.OFF: SingleSpaceSeparator
+    private static final QName QN_CONTENTS            = new QName(WMTSTileSource.WMTS_NS_URL, "Contents");
+    private static final QName QN_FORMAT              = new QName(WMTSTileSource.WMTS_NS_URL, "Format");
+    private static final QName QN_LAYER               = new QName(WMTSTileSource.WMTS_NS_URL, "Layer");
+    private static final QName QN_MATRIX_WIDTH        = new QName(WMTSTileSource.WMTS_NS_URL, "MatrixWidth");
+    private static final QName QN_MATRIX_HEIGHT       = new QName(WMTSTileSource.WMTS_NS_URL, "MatrixHeight");
+    private static final QName QN_RESOURCE_URL        = new QName(WMTSTileSource.WMTS_NS_URL, "ResourceURL");
+    private static final QName QN_SCALE_DENOMINATOR   = new QName(WMTSTileSource.WMTS_NS_URL, "ScaleDenominator");
+    private static final QName QN_STYLE               = new QName(WMTSTileSource.WMTS_NS_URL, "Style");
+    private static final QName QN_TILEMATRIX          = new QName(WMTSTileSource.WMTS_NS_URL, "TileMatrix");
+    private static final QName QN_TILEMATRIXSET       = new QName(WMTSTileSource.WMTS_NS_URL, "TileMatrixSet");
+    private static final QName QN_TILEMATRIX_SET_LINK = new QName(WMTSTileSource.WMTS_NS_URL, "TileMatrixSetLink");
+    private static final QName QN_TILE_WIDTH          = new QName(WMTSTileSource.WMTS_NS_URL, "TileWidth");
+    private static final QName QN_TILE_HEIGHT         = new QName(WMTSTileSource.WMTS_NS_URL, "TileHeight");
+    private static final QName QN_TOPLEFT_CORNER      = new QName(WMTSTileSource.WMTS_NS_URL, "TopLeftCorner");
+    // CHECKSTYLE.ON: SingleSpaceSeparator
+
     private static final String PATTERN_HEADER = "\\{header\\(([^,]+),([^}]+)\\)\\}";
 
     private static final String URL_GET_ENCODING_PARAMS = "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER={layer}&STYLE={style}&"
@@ -68,10 +90,6 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
         PATTERN_HEADER,
     };
 
-    private static final String OWS_NS_URL = "http://www.opengis.net/ows/1.1";
-    private static final String WMTS_NS_URL = "http://www.opengis.net/wmts/1.0";
-    private static final String XLINK_NS_URL = "http://www.w3.org/1999/xlink";
-
     private static class TileMatrix {
         private String identifier;
         private double scaleDenominator;
@@ -125,7 +143,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
         private TileMatrixSet tileMatrixSet;
         private String baseUrl;
         private String style;
-        public Collection<String> tileMatrixSetLinks = new ArrayList<>();
+        private final Collection<String> tileMatrixSetLinks = new ArrayList<>();
 
         Layer(Layer l) {
             if (l != null) {
@@ -141,37 +159,13 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
         }
     }
 
-    private enum TransferMode {
-        KVP("KVP"),
-        REST("RESTful");
-
-        private final String typeString;
-
-        TransferMode(String urlString) {
-            this.typeString = urlString;
-        }
-
-        private String getTypeString() {
-            return typeString;
-        }
-
-        private static TransferMode fromString(String s) {
-            for (TransferMode type : TransferMode.values()) {
-                if (type.getTypeString().equals(s)) {
-                    return type;
-                }
-            }
-            return null;
-        }
-    }
-
     private static final class SelectLayerDialog extends ExtendedDialog {
-        private final transient Layer[] layers;
+        private final transient List<Entry<String, List<Layer>>> layers;
         private final JTable list;
 
         SelectLayerDialog(Collection<Layer> layers) {
             super(Main.parent, tr("Select WMTS layer"), new String[]{tr("Add layers"), tr("Cancel")});
-            this.layers = layers.toArray(new Layer[]{});
+            this.layers = groupLayersByName(layers);
             //getLayersTable(layers, Main.getProjection())
             this.list = new JTable(
                     new AbstractTableModel() {
@@ -179,11 +173,17 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
                         public Object getValueAt(int rowIndex, int columnIndex) {
                             switch (columnIndex) {
                             case 0:
-                                return SelectLayerDialog.this.layers[rowIndex].name;
+                                return SelectLayerDialog.this.layers.get(rowIndex).getKey();
                             case 1:
-                                return SelectLayerDialog.this.layers[rowIndex].tileMatrixSet.crs;
+                                return SelectLayerDialog.this.layers.get(rowIndex).getValue()
+                                        .stream()
+                                        .map(x -> x.tileMatrixSet.crs)
+                                        .collect(Collectors.joining(", "));
                             case 2:
-                                return SelectLayerDialog.this.layers[rowIndex].tileMatrixSet.identifier;
+                                return SelectLayerDialog.this.layers.get(rowIndex).getValue()
+                                        .stream()
+                                        .map(x -> x.tileMatrixSet.identifier)
+                                        .collect(Collectors.joining(", "));
                             default:
                                 throw new IllegalArgumentException();
                             }
@@ -191,7 +191,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
 
                         @Override
                         public int getRowCount() {
-                            return SelectLayerDialog.this.layers.length;
+                            return SelectLayerDialog.this.layers.size();
                         }
 
                         @Override
@@ -223,24 +223,31 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
             setContent(panel);
         }
 
-        public Layer getSelectedLayer() {
+        private static List<Entry<String, List<Layer>>> groupLayersByName(Collection<Layer> layers) {
+            Map<String, List<Layer>> layerByName = layers.stream().collect(Collectors.groupingBy(x -> x.name));
+            return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList());
+        }
+
+        public String getSelectedLayer() {
             int index = list.getSelectedRow();
             if (index < 0) {
                 return null; //nothing selected
             }
-            return layers[index];
+            return layers.get(index).getKey();
         }
     }
 
     private final Map<String, String> headers = new ConcurrentHashMap<>();
-    private Collection<Layer> layers;
+    private final Collection<Layer> layers;
     private Layer currentLayer;
     private TileMatrixSet currentTileMatrixSet;
     private double crsScale;
-    private TransferMode transferMode;
+    private GetCapabilitiesParseHelper.TransferMode transferMode;
 
     private ScaleList nativeScaleList;
 
+    private final String defaultLayer;
+
     /**
      * Creates a tile source based on imagery info
      * @param info imagery info
@@ -249,32 +256,36 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
      */
     public WMTSTileSource(ImageryInfo info) throws IOException {
         super(info);
-        this.baseUrl = normalizeCapabilitiesUrl(handleTemplate(info.getUrl()));
+        CheckParameterUtil.ensureThat(info.getDefaultLayers().size() < 2, "At most 1 default layer for WMTS is supported");
+
+        this.baseUrl = GetCapabilitiesParseHelper.normalizeCapabilitiesUrl(handleTemplate(info.getUrl()));
         this.layers = getCapabilities();
+        this.defaultLayer = info.getDefaultLayers().isEmpty() ? null : info.getDefaultLayers().iterator().next();
         if (this.layers.isEmpty())
             throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl()));
     }
 
-    private static Layer userSelectLayer(Collection<Layer> layers) {
-        if (layers.size() == 1)
-            return layers.iterator().next();
-        Layer ret = null;
+    /**
+     * Creates a dialog based on this tile source with all available layers and returns the name of selected layer
+     * @return Name of selected layer
+     */
+    public String userSelectLayer() {
+        Collection<String> layerNames = layers.stream().map(x -> x.name).collect(Collectors.toSet());
+
+        // if there is only one layer name no point in asking
+        if (layerNames.size() == 1)
+            return layerNames.iterator().next();
 
         final SelectLayerDialog layerSelection = new SelectLayerDialog(layers);
         if (layerSelection.showDialog().getValue() == 1) {
-            ret = layerSelection.getSelectedLayer();
-            // TODO: save layer information into ImageryInfo / ImageryPreferences?
-        }
-        if (ret == null) {
-            // user canceled operation or did not choose any layer
-            throw new IllegalArgumentException(tr("No layer selected"));
+            return layerSelection.getSelectedLayer();
         }
-        return ret;
+        return null;
     }
 
     private String handleTemplate(String url) {
         Pattern pattern = Pattern.compile(PATTERN_HEADER);
-        StringBuffer output = new StringBuffer(); // NOSONAR
+        StringBuffer output = new StringBuffer();
         Matcher matcher = pattern.matcher(url);
         while (matcher.find()) {
             this.headers.put(matcher.group(1), matcher.group(2));
@@ -290,42 +301,41 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
      * @throws IllegalArgumentException in case of any other error
      */
     private Collection<Layer> getCapabilities() throws IOException {
-        XMLInputFactory factory = XMLInputFactory.newFactory();
-        // do not try to load external entities, nor validate the XML
-        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
-        factory.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE);
-        factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
-
         try (CachedFile cf = new CachedFile(baseUrl); InputStream in = cf.setHttpHeaders(headers).
                 setMaxAge(7 * CachedFile.DAYS).
                 setCachingStrategy(CachedFile.CachingStrategy.IfModifiedSince).
                 getInputStream()) {
             byte[] data = Utils.readBytesFromStream(in);
             if (data == null || data.length == 0) {
+                cf.clear();
                 throw new IllegalArgumentException("Could not read data from: " + baseUrl);
             }
-            XMLStreamReader reader = factory.createXMLStreamReader(new ByteArrayInputStream(data));
 
-            Collection<Layer> ret = new ArrayList<>();
-            for (int event = reader.getEventType(); reader.hasNext(); event = reader.next()) {
-                if (event == XMLStreamReader.START_ELEMENT) {
-                    if (new QName(OWS_NS_URL, "OperationsMetadata").equals(reader.getName())) {
-                        parseOperationMetadata(reader);
-                    }
+            try {
+                XMLStreamReader reader = GetCapabilitiesParseHelper.getReader(new ByteArrayInputStream(data));
+                Collection<Layer> ret = new ArrayList<>();
+                for (int event = reader.getEventType(); reader.hasNext(); event = reader.next()) {
+                    if (event == XMLStreamReader.START_ELEMENT) {
+                        if (GetCapabilitiesParseHelper.QN_OWS_OPERATIONS_METADATA.equals(reader.getName())) {
+                            parseOperationMetadata(reader);
+                        }
 
-                    if (new QName(WMTS_NS_URL, "Contents").equals(reader.getName())) {
-                        ret = parseContents(reader);
+                        if (QN_CONTENTS.equals(reader.getName())) {
+                            ret = parseContents(reader);
+                        }
                     }
                 }
+                return ret;
+            } catch (XMLStreamException e) {
+                cf.clear();
+                Main.warn(new String(data, StandardCharsets.UTF_8));
+                throw new IllegalArgumentException(e);
             }
-            return ret;
-        } catch (XMLStreamException e) {
-            throw new IllegalArgumentException(e);
         }
     }
 
     /**
-     * Parse Contents tag. Renturns when reader reaches Contents closing tag
+     * Parse Contents tag. Returns when reader reaches Contents closing tag
      *
      * @param reader StAX reader instance
      * @return collection of layers within contents with properly linked TileMatrixSets
@@ -335,13 +345,13 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
         Map<String, TileMatrixSet> matrixSetById = new ConcurrentHashMap<>();
         Collection<Layer> layers = new ArrayList<>();
         for (int event = reader.getEventType();
-                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && new QName(WMTS_NS_URL, "Contents").equals(reader.getName()));
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && QN_CONTENTS.equals(reader.getName()));
                 event = reader.next()) {
             if (event == XMLStreamReader.START_ELEMENT) {
-                if (new QName(WMTS_NS_URL, "Layer").equals(reader.getName())) {
+                if (QN_LAYER.equals(reader.getName())) {
                     layers.add(parseLayer(reader));
                 }
-                if (new QName(WMTS_NS_URL, "TileMatrixSet").equals(reader.getName())) {
+                if (QN_TILEMATRIXSET.equals(reader.getName())) {
                     TileMatrixSet entry = parseTileMatrixSet(reader);
                     matrixSetById.put(entry.identifier, entry);
                 }
@@ -371,28 +381,28 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
         Stack<QName> tagStack = new Stack<>();
 
         for (int event = reader.getEventType();
-                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && new QName(WMTS_NS_URL, "Layer").equals(reader.getName()));
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && QN_LAYER.equals(reader.getName()));
                 event = reader.next()) {
             if (event == XMLStreamReader.START_ELEMENT) {
                 tagStack.push(reader.getName());
                 if (tagStack.size() == 2) {
-                    if (new QName(WMTS_NS_URL, "Format").equals(reader.getName())) {
+                    if (QN_FORMAT.equals(reader.getName())) {
                         layer.format = reader.getElementText();
-                    } else if (new QName(OWS_NS_URL, "Identifier").equals(reader.getName())) {
+                    } else if (GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER.equals(reader.getName())) {
                         layer.name = reader.getElementText();
-                    } else if (new QName(WMTS_NS_URL, "ResourceURL").equals(reader.getName()) &&
+                    } else if (QN_RESOURCE_URL.equals(reader.getName()) &&
                             "tile".equals(reader.getAttributeValue("", "resourceType"))) {
                         layer.baseUrl = reader.getAttributeValue("", "template");
-                    } else if (new QName(WMTS_NS_URL, "Style").equals(reader.getName()) &&
+                    } else if (QN_STYLE.equals(reader.getName()) &&
                             "true".equals(reader.getAttributeValue("", "isDefault"))) {
-                        if (moveReaderToTag(reader, new QName[] {new QName(OWS_NS_URL, "Identifier")})) {
+                        if (GetCapabilitiesParseHelper.moveReaderToTag(reader, new QName[] {GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER})) {
                             layer.style = reader.getElementText();
                             tagStack.push(reader.getName()); // keep tagStack in sync
                         }
-                    } else if (new QName(WMTS_NS_URL, "TileMatrixSetLink").equals(reader.getName())) {
+                    } else if (QN_TILEMATRIX_SET_LINK.equals(reader.getName())) {
                         layer.tileMatrixSetLinks.add(praseTileMatrixSetLink(reader));
                     } else {
-                        moveReaderToEndCurrentTag(reader);
+                        GetCapabilitiesParseHelper.moveReaderToEndCurrentTag(reader);
                     }
                 }
             }
@@ -412,33 +422,6 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
     }
 
     /**
-     * Moves the reader to the closing tag of current tag.
-     * @param reader XML stream reader positioned on XMLStreamReader.START_ELEMENT
-     * @throws XMLStreamException when parse exception occurs
-     */
-    private static void moveReaderToEndCurrentTag(XMLStreamReader reader) throws XMLStreamException {
-        int level = 0;
-        QName tag = reader.getName();
-        for (int event = reader.getEventType(); reader.hasNext(); event = reader.next()) {
-            switch (event) {
-            case XMLStreamReader.START_ELEMENT:
-                level += 1;
-                break;
-            case XMLStreamReader.END_ELEMENT:
-                level -= 1;
-                if (level == 0 && tag.equals(reader.getName())) {
-                    return;
-                }
-            }
-            if (level < 0) {
-                throw new IllegalStateException("WMTS Parser error - moveReaderToEndCurrentTag failed to find closing tag");
-            }
-        }
-        throw new IllegalStateException("WMTS Parser error - moveReaderToEndCurrentTag failed to find closing tag");
-
-    }
-
-    /**
      * Gets TileMatrixSetLink value. Returns when reader is on TileMatrixSetLink closing tag
      *
      * @param reader StAX reader instance
@@ -449,9 +432,9 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
         String ret = null;
         for (int event = reader.getEventType();
                 reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT &&
-                        new QName(WMTS_NS_URL, "TileMatrixSetLink").equals(reader.getName()));
+                        QN_TILEMATRIX_SET_LINK.equals(reader.getName()));
                 event = reader.next()) {
-            if (event == XMLStreamReader.START_ELEMENT && new QName(WMTS_NS_URL, "TileMatrixSet").equals(reader.getName())) {
+            if (event == XMLStreamReader.START_ELEMENT && QN_TILEMATRIXSET.equals(reader.getName())) {
                 ret = reader.getElementText();
             }
         }
@@ -467,16 +450,16 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
     private static TileMatrixSet parseTileMatrixSet(XMLStreamReader reader) throws XMLStreamException {
         TileMatrixSetBuilder matrixSet = new TileMatrixSetBuilder();
         for (int event = reader.getEventType();
-                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && new QName(WMTS_NS_URL, "TileMatrixSet").equals(reader.getName()));
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && QN_TILEMATRIXSET.equals(reader.getName()));
                 event = reader.next()) {
                     if (event == XMLStreamReader.START_ELEMENT) {
-                        if (new QName(OWS_NS_URL, "Identifier").equals(reader.getName())) {
+                        if (GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER.equals(reader.getName())) {
                             matrixSet.identifier = reader.getElementText();
                         }
-                        if (new QName(OWS_NS_URL, "SupportedCRS").equals(reader.getName())) {
-                            matrixSet.crs = crsToCode(reader.getElementText());
+                        if (GetCapabilitiesParseHelper.QN_OWS_SUPPORTED_CRS.equals(reader.getName())) {
+                            matrixSet.crs = GetCapabilitiesParseHelper.crsToCode(reader.getElementText());
                         }
-                        if (new QName(WMTS_NS_URL, "TileMatrix").equals(reader.getName())) {
+                        if (QN_TILEMATRIX.equals(reader.getName())) {
                             matrixSet.tileMatrix.add(parseTileMatrix(reader, matrixSet.crs));
                         }
                     }
@@ -500,16 +483,16 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
             matrixProj = Main.getProjection();
         }
         for (int event = reader.getEventType();
-                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && new QName(WMTS_NS_URL, "TileMatrix").equals(reader.getName()));
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && QN_TILEMATRIX.equals(reader.getName()));
                 event = reader.next()) {
             if (event == XMLStreamReader.START_ELEMENT) {
-                if (new QName(OWS_NS_URL, "Identifier").equals(reader.getName())) {
+                if (GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER.equals(reader.getName())) {
                     ret.identifier = reader.getElementText();
                 }
-                if (new QName(WMTS_NS_URL, "ScaleDenominator").equals(reader.getName())) {
+                if (QN_SCALE_DENOMINATOR.equals(reader.getName())) {
                     ret.scaleDenominator = Double.parseDouble(reader.getElementText());
                 }
-                if (new QName(WMTS_NS_URL, "TopLeftCorner").equals(reader.getName())) {
+                if (QN_TOPLEFT_CORNER.equals(reader.getName())) {
                     String[] topLeftCorner = reader.getElementText().split(" ");
                     if (matrixProj.switchXY()) {
                         ret.topLeftCorner = new EastNorth(Double.parseDouble(topLeftCorner[1]), Double.parseDouble(topLeftCorner[0]));
@@ -517,16 +500,16 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
                         ret.topLeftCorner = new EastNorth(Double.parseDouble(topLeftCorner[0]), Double.parseDouble(topLeftCorner[1]));
                     }
                 }
-                if (new QName(WMTS_NS_URL, "TileHeight").equals(reader.getName())) {
+                if (QN_TILE_HEIGHT.equals(reader.getName())) {
                     ret.tileHeight = Integer.parseInt(reader.getElementText());
                 }
-                if (new QName(WMTS_NS_URL, "TileWidth").equals(reader.getName())) {
+                if (QN_TILE_WIDTH.equals(reader.getName())) {
                     ret.tileWidth = Integer.parseInt(reader.getElementText());
                 }
-                if (new QName(WMTS_NS_URL, "MatrixHeight").equals(reader.getName())) {
+                if (QN_MATRIX_HEIGHT.equals(reader.getName())) {
                     ret.matrixHeight = Integer.parseInt(reader.getElementText());
                 }
-                if (new QName(WMTS_NS_URL, "MatrixWidth").equals(reader.getName())) {
+                if (QN_MATRIX_WIDTH.equals(reader.getName())) {
                     ret.matrixWidth = Integer.parseInt(reader.getElementText());
                 }
             }
@@ -548,122 +531,33 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
     private void parseOperationMetadata(XMLStreamReader reader) throws XMLStreamException {
         for (int event = reader.getEventType();
                 reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT &&
-                        new QName(OWS_NS_URL, "OperationsMetadata").equals(reader.getName()));
+                        GetCapabilitiesParseHelper.QN_OWS_OPERATIONS_METADATA.equals(reader.getName()));
                 event = reader.next()) {
-            if (event == XMLStreamReader.START_ELEMENT) {
-                if (new QName(OWS_NS_URL, "Operation").equals(reader.getName()) && "GetTile".equals(reader.getAttributeValue("", "name")) &&
-                        moveReaderToTag(reader, new QName[]{
-                                new QName(OWS_NS_URL, "DCP"),
-                                new QName(OWS_NS_URL, "HTTP"),
-                                new QName(OWS_NS_URL, "Get"),
-
-                        })) {
-                    this.baseUrl = reader.getAttributeValue(XLINK_NS_URL, "href");
-                    this.transferMode = getTransferMode(reader);
-                }
+            if (event == XMLStreamReader.START_ELEMENT &&
+                    GetCapabilitiesParseHelper.QN_OWS_OPERATION.equals(reader.getName()) &&
+                    "GetTile".equals(reader.getAttributeValue("", "name")) &&
+                    GetCapabilitiesParseHelper.moveReaderToTag(reader, new QName[] {
+                            GetCapabilitiesParseHelper.QN_OWS_DCP,
+                            GetCapabilitiesParseHelper.QN_OWS_HTTP,
+                            GetCapabilitiesParseHelper.QN_OWS_GET,
+                    })) {
+                this.baseUrl = reader.getAttributeValue(GetCapabilitiesParseHelper.XLINK_NS_URL, "href");
+                this.transferMode = GetCapabilitiesParseHelper.getTransferMode(reader);
             }
         }
     }
 
     /**
-     * Parses Operation[@name='GetTile']/DCP/HTTP/Get section. Returns when reader is on Get closing tag.
-     * @param reader StAX reader instance
-     * @return TransferMode coded in this section
-     * @throws XMLStreamException See {@link XMLStreamReader}
-     */
-    private static TransferMode getTransferMode(XMLStreamReader reader) throws XMLStreamException {
-        QName getQname = new QName(OWS_NS_URL, "Get");
-
-        Utils.ensure(getQname.equals(reader.getName()), "WMTS Parser state invalid. Expected element %s, got %s",
-                getQname, reader.getName());
-        for (int event = reader.getEventType();
-                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && getQname.equals(reader.getName()));
-                event = reader.next()) {
-            if (event == XMLStreamReader.START_ELEMENT && new QName(OWS_NS_URL, "Constraint").equals(reader.getName())
-             && "GetEncoding".equals(reader.getAttributeValue("", "name"))) {
-                moveReaderToTag(reader, new QName[]{
-                        new QName(OWS_NS_URL, "AllowedValues"),
-                        new QName(OWS_NS_URL, "Value")
-                });
-                return TransferMode.fromString(reader.getElementText());
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Moves reader to first occurrence of the structure equivalent of Xpath tags[0]/tags[1]../tags[n]. If fails to find
-     * moves the reader to the closing tag of current tag
-     *
-     * @param reader StAX reader instance
-     * @param tags array of tags
-     * @return true if tag was found, false otherwise
-     * @throws XMLStreamException See {@link XMLStreamReader}
-     */
-    private static boolean moveReaderToTag(XMLStreamReader reader, QName ... tags) throws XMLStreamException {
-        QName stopTag = reader.getName();
-        int currentLevel = 0;
-        QName searchTag = tags[currentLevel];
-        QName parentTag = null;
-        QName skipTag = null;
-
-        for (int event = 0; //skip current element, so we will not skip it as a whole
-                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && stopTag.equals(reader.getName()));
-                event = reader.next()) {
-            if (event == XMLStreamReader.END_ELEMENT && skipTag != null && skipTag.equals(reader.getName())) {
-                skipTag = null;
-            }
-            if (skipTag == null) {
-                if (event == XMLStreamReader.START_ELEMENT) {
-                    if (searchTag.equals(reader.getName())) {
-                        currentLevel += 1;
-                        if (currentLevel >= tags.length) {
-                            return true; // found!
-                        }
-                        parentTag = searchTag;
-                        searchTag = tags[currentLevel];
-                    } else {
-                        skipTag = reader.getName();
-                    }
-                }
-
-                if (event == XMLStreamReader.END_ELEMENT && parentTag != null && parentTag.equals(reader.getName())) {
-                    currentLevel -= 1;
-                    searchTag = parentTag;
-                    if (currentLevel >= 0) {
-                        parentTag = tags[currentLevel];
-                    } else {
-                        parentTag = null;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private static String normalizeCapabilitiesUrl(String url) throws MalformedURLException {
-        URL inUrl = new URL(url);
-        URL ret = new URL(inUrl.getProtocol(), inUrl.getHost(), inUrl.getPort(), inUrl.getFile());
-        return ret.toExternalForm();
-    }
-
-    private static String crsToCode(String crsIdentifier) {
-        if (crsIdentifier.startsWith("urn:ogc:def:crs:")) {
-            return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*):.*:(.*)$", "$1:$2");
-        }
-        return crsIdentifier;
-    }
-
-    /**
      * Initializes projection for this TileSource with projection
      * @param proj projection to be used by this TileSource
      */
     public void initProjection(Projection proj) {
         // getLayers will return only layers matching the name, if the user already choose the layer
         // so we will not ask the user again to chose the layer, if he just changes projection
-        Collection<Layer> candidates = getLayers(currentLayer != null ? currentLayer.name : null, proj.toCode());
-        if (!candidates.isEmpty()) {
-            Layer newLayer = userSelectLayer(candidates);
+        Collection<Layer> candidates = getLayers(currentLayer != null ? currentLayer.name : defaultLayer, proj.toCode());
+        if (candidates.size() == 1) {
+
+            Layer newLayer = candidates.iterator().next();
             if (newLayer != null) {
                 this.currentTileMatrixSet = newLayer.tileMatrixSet;
                 this.currentLayer = newLayer;
@@ -673,6 +567,12 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
                 }
                 this.nativeScaleList = new ScaleList(scales);
             }
+        } else if (candidates.size() > 1) {
+            Main.warn("More than one layer WMTS available: {0} for projection {1} and name {2}. Do not know which to process",
+                    candidates.stream().map(x -> x.name + ": " + x.tileMatrixSet.identifier).collect(Collectors.joining(", ")),
+                    proj.toCode(),
+                    currentLayer != null ? currentLayer.name : defaultLayer
+                    );
         }
         this.crsScale = getTileSize() * 0.28e-03 / proj.getMetersPerUnit();
     }
@@ -699,9 +599,9 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
     public int getTileSize() {
         // no support for non-square tiles (tileHeight != tileWidth)
         // and for different tile sizes at different zoom levels
-        Collection<Layer> layers = getLayers(null, Main.getProjection().toCode());
-        if (!layers.isEmpty()) {
-            return layers.iterator().next().tileMatrixSet.tileMatrix.get(0).tileHeight;
+        Collection<Layer> projLayers = getLayers(null, Main.getProjection().toCode());
+        if (!projLayers.isEmpty()) {
+            return projLayers.iterator().next().tileMatrixSet.tileMatrix.get(0).tileHeight;
         }
         // if no layers is found, fallback to default mercator tile size. Maybe it will work
         Main.warn("WMTS: Could not determine tile size. Using default tile size of: {0}", getDefaultTileSize());
@@ -710,11 +610,11 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
 
     @Override
     public String getTileUrl(int zoom, int tilex, int tiley) {
-        String url;
         if (currentLayer == null) {
             return "";
         }
 
+        String url;
         if (currentLayer.baseUrl != null && transferMode == null) {
             url = currentLayer.baseUrl;
         } else {
diff --git a/src/org/openstreetmap/josm/data/osm/Changeset.java b/src/org/openstreetmap/josm/data/osm/Changeset.java
index d8b9cd8..fd2c044 100644
--- a/src/org/openstreetmap/josm/data/osm/Changeset.java
+++ b/src/org/openstreetmap/josm/data/osm/Changeset.java
@@ -207,11 +207,12 @@ public final class Changeset implements Tagged {
     @Override
     public void setKeys(Map<String, String> keys) {
         CheckParameterUtil.ensureParameterNotNull(keys, "keys");
-        for (String value : keys.values()) {
-            if (value != null && value.length() > MAX_CHANGESET_TAG_LENGTH) {
+        keys.values().stream()
+                .filter(value -> value != null && value.length() > MAX_CHANGESET_TAG_LENGTH)
+                .findFirst()
+                .ifPresent(value -> {
                 throw new IllegalArgumentException("Changeset tag value is too long: "+value);
-            }
-        }
+        });
         this.tags = keys;
     }
 
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
index a2ef26f..a97955a 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
@@ -182,13 +183,9 @@ public final class ChangesetCache implements PreferenceChangedListener {
      * @return The list of open changesets
      */
     public List<Changeset> getOpenChangesets() {
-        List<Changeset> ret = new ArrayList<>();
-        for (Changeset cs: cache.values()) {
-            if (cs.isOpen()) {
-                ret.add(cs);
-            }
-        }
-        return ret;
+        return cache.values().stream()
+                .filter(Changeset::isOpen)
+                .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java b/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
index 7c363fb..e0fc24b 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
@@ -2,11 +2,11 @@
 package org.openstreetmap.josm.data.osm;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -116,13 +116,10 @@ public class ChangesetDataSet {
      */
     public Set<HistoryOsmPrimitive> getPrimitivesByModificationType(ChangesetModificationType cmt) {
         CheckParameterUtil.ensureParameterNotNull(cmt, "cmt");
-        Set<HistoryOsmPrimitive> ret = new HashSet<>();
-        for (Entry<PrimitiveId, ChangesetModificationType> entry: modificationTypes.entrySet()) {
-            if (entry.getValue().equals(cmt)) {
-                ret.add(primitives.get(entry.getKey()));
-            }
-        }
-        return ret;
+        return modificationTypes.entrySet().stream()
+                .filter(entry -> entry.getValue().equals(cmt))
+                .map(entry -> primitives.get(entry.getKey()))
+                .collect(Collectors.toSet());
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index ae31a3a..8c86b12 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.data.osm;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -21,9 +20,9 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Data;
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.ProjectionBounds;
@@ -93,7 +92,7 @@ import org.openstreetmap.josm.tools.Utils;
  *
  * @author imi
  */
-public final class DataSet implements Data, Cloneable, ProjectionChangeListener {
+public final class DataSet implements Data, ProjectionChangeListener {
 
     /**
      * Maximum number of events that can be fired between beginUpdate/endUpdate to be send as single events (ie without DatasetChangedEvent)
@@ -421,13 +420,9 @@ public final class DataSet implements Data, Cloneable, ProjectionChangeListener
         lock.readLock().lock();
         try {
             // QuadBuckets might be useful here (don't forget to do reindexing after some of rm is changed)
-            List<Relation> result = new ArrayList<>();
-            for (Relation r: relations) {
-                if (r.getBBox().intersects(bbox)) {
-                    result.add(r);
-                }
-            }
-            return result;
+            return relations.stream()
+                    .filter(r -> r.getBBox().intersects(bbox))
+                    .collect(Collectors.toList());
         } finally {
             lock.readLock().unlock();
         }
@@ -920,24 +915,9 @@ public final class DataSet implements Data, Cloneable, ProjectionChangeListener
         }
     }
 
-    /**
-     * Return a copy of this dataset
-     * @deprecated Use the copy constructor instead. Remove in July 2016
-     */
-    @Deprecated
-    @Override
-    public DataSet clone() {
-        return new DataSet(this);
-    }
-
     @Override
     public Collection<DataSource> getDataSources() {
-        return dataSources;
-    }
-
-    @Override
-    public Area getDataSourceArea() {
-        return DataSource.getDataSourceArea(dataSources);
+        return Collections.unmodifiableCollection(dataSources);
     }
 
     /**
@@ -1337,11 +1317,6 @@ public final class DataSet implements Data, Cloneable, ProjectionChangeListener
         }
     }
 
-    @Override
-    public List<Bounds> getDataSourceBounds() {
-        return DataSource.getDataSourceBounds(dataSources);
-    }
-
     /**
      * Moves all primitives and datasources from DataSet "from" to this DataSet.
      * @param from The source DataSet
diff --git a/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java b/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java
index efb724c..07c6ebd 100644
--- a/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java
+++ b/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java
@@ -11,6 +11,7 @@ import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +19,7 @@ import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.RecursiveTask;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.Main;
@@ -40,6 +42,59 @@ public class MultipolygonBuilder {
             Utils.newForkJoinPool("multipolygon_creation.numberOfThreads", "multipolygon-builder-%d", Thread.NORM_PRIORITY);
 
     /**
+     * Helper class to avoid unneeded costly intersection calculations.
+     * If the intersection between polygons a and b was calculated we also know
+     * the result of intersection between b and a. The lookup in the hash tables is
+     * much faster than the intersection calculation.
+     */
+    private static class IntersectionMatrix {
+        private final Map<Pair<JoinedPolygon, JoinedPolygon>, PolygonIntersection> results;
+
+        IntersectionMatrix(Collection<JoinedPolygon> polygons) {
+            results = new HashMap<>(Utils.hashMapInitialCapacity(polygons.size() * polygons.size()));
+        }
+
+        /**
+         * Compute the reverse result of the intersection test done by {@code Geometry.polygonIntersection(Area a1, Area a2)}
+         *
+         * @param intersection the intersection result for polygons a1 and a2 (in that order)
+         * @return the intersection result for a2 and a1
+         */
+        private PolygonIntersection getReverseIntersectionResult(PolygonIntersection intersection) {
+            switch (intersection) {
+                case FIRST_INSIDE_SECOND:
+                    return PolygonIntersection.SECOND_INSIDE_FIRST;
+                case SECOND_INSIDE_FIRST:
+                    return PolygonIntersection.FIRST_INSIDE_SECOND;
+                default:
+                    return intersection;
+            }
+        }
+
+        /**
+         * Returns the precomputed intersection between two polygons if known. Otherwise perform {@code computation}.
+         *
+         * @param a1          first polygon
+         * @param a2          second polygon
+         * @param computation the computation to perform when intersection is unknown
+         * @return the intersection between two polygons
+         * @see Map#computeIfAbsent
+         */
+        PolygonIntersection computeIfAbsent(JoinedPolygon a1, JoinedPolygon a2, Supplier<PolygonIntersection> computation) {
+            PolygonIntersection intersection = results.get(Pair.create(a1, a2));
+            if (intersection == null) {
+                intersection = computation.get();
+                synchronized (results) {
+                    results.put(Pair.create(a1, a2), intersection);
+                    results.put(Pair.create(a2, a1), getReverseIntersectionResult(intersection));
+                }
+            }
+            return intersection;
+        }
+
+    }
+
+    /**
      * Represents one polygon that consists of multiple ways.
      */
     public static class JoinedPolygon {
@@ -291,7 +346,8 @@ public class MultipolygonBuilder {
         return null;
     }
 
-    private static Pair<Boolean, List<JoinedPolygon>> findInnerWaysCandidates(JoinedPolygon outerWay, Collection<JoinedPolygon> boundaryWays) {
+    private static Pair<Boolean, List<JoinedPolygon>> findInnerWaysCandidates(IntersectionMatrix cache,
+            JoinedPolygon outerWay, Collection<JoinedPolygon> boundaryWays) {
         boolean outerGood = true;
         List<JoinedPolygon> innerCandidates = new ArrayList<>();
 
@@ -303,7 +359,8 @@ public class MultipolygonBuilder {
             // Preliminary computation on bounds. If bounds do not intersect, no need to do a costly area intersection
             if (outerWay.bounds.intersects(innerWay.bounds)) {
                 // Bounds intersection, let's see in detail
-                PolygonIntersection intersection = Geometry.polygonIntersection(outerWay.area, innerWay.area);
+                final PolygonIntersection intersection = cache.computeIfAbsent(outerWay, innerWay,
+                        () -> Geometry.polygonIntersection(outerWay.area, innerWay.area));
 
                 if (intersection == PolygonIntersection.FIRST_INSIDE_SECOND) {
                     outerGood = false;  // outer is inside another polygon
@@ -326,7 +383,8 @@ public class MultipolygonBuilder {
      * @return the outermostWay, or {@code null} if intersection found.
      */
     private static List<PolygonLevel> findOuterWaysMultiThread(List<JoinedPolygon> boundaryWays) {
-        return THREAD_POOL.invoke(new Worker(boundaryWays, 0, boundaryWays.size(), new ArrayList<PolygonLevel>(),
+        final IntersectionMatrix cache = new IntersectionMatrix(boundaryWays);
+        return THREAD_POOL.invoke(new Worker(cache, boundaryWays, 0, boundaryWays.size(), new ArrayList<PolygonLevel>(),
                 Math.max(32, boundaryWays.size() / THREAD_POOL.getParallelism() / 3)));
     }
 
@@ -340,8 +398,10 @@ public class MultipolygonBuilder {
         private final int to;
         private final transient List<PolygonLevel> output;
         private final int directExecutionTaskSize;
+        private final IntersectionMatrix cache;
 
-        Worker(List<JoinedPolygon> input, int from, int to, List<PolygonLevel> output, int directExecutionTaskSize) {
+        Worker(IntersectionMatrix cache, List<JoinedPolygon> input, int from, int to, List<PolygonLevel> output, int directExecutionTaskSize) {
+            this.cache = cache;
             this.input = input;
             this.from = from;
             this.to = to;
@@ -352,15 +412,16 @@ public class MultipolygonBuilder {
         /**
          * Collects outer way and corresponding inner ways from all boundaries.
          * @param level nesting level
+         * @param cache cache that tracks previously calculated results
          * @param boundaryWays boundary ways
          * @return the outermostWay, or {@code null} if intersection found.
          */
-        private static List<PolygonLevel> findOuterWaysRecursive(int level, List<JoinedPolygon> boundaryWays) {
+        private static List<PolygonLevel> findOuterWaysRecursive(int level, IntersectionMatrix cache, List<JoinedPolygon> boundaryWays) {
 
             final List<PolygonLevel> result = new ArrayList<>();
 
             for (JoinedPolygon outerWay : boundaryWays) {
-                if (processOuterWay(level, boundaryWays, result, outerWay) == null) {
+                if (processOuterWay(level, cache, boundaryWays, result, outerWay) == null) {
                     return null;
                 }
             }
@@ -368,9 +429,9 @@ public class MultipolygonBuilder {
             return result;
         }
 
-        private static List<PolygonLevel> processOuterWay(int level, List<JoinedPolygon> boundaryWays,
+        private static List<PolygonLevel> processOuterWay(int level, IntersectionMatrix cache, List<JoinedPolygon> boundaryWays,
                 final List<PolygonLevel> result, JoinedPolygon outerWay) {
-            Pair<Boolean, List<JoinedPolygon>> p = findInnerWaysCandidates(outerWay, boundaryWays);
+            Pair<Boolean, List<JoinedPolygon>> p = findInnerWaysCandidates(cache, outerWay, boundaryWays);
             if (p == null) {
                 // ways intersect
                 return null;
@@ -382,7 +443,7 @@ public class MultipolygonBuilder {
 
                 //process inner ways
                 if (!p.b.isEmpty()) {
-                    List<PolygonLevel> innerList = findOuterWaysRecursive(level + 1, p.b);
+                    List<PolygonLevel> innerList = findOuterWaysRecursive(level + 1, cache, p.b);
                     if (innerList == null) {
                         return null; //intersection found
                     }
@@ -408,7 +469,7 @@ public class MultipolygonBuilder {
             } else {
                 final Collection<ForkJoinTask<List<PolygonLevel>>> tasks = new ArrayList<>();
                 for (int fromIndex = from; fromIndex < to; fromIndex += directExecutionTaskSize) {
-                    tasks.add(new Worker(input, fromIndex, Math.min(fromIndex + directExecutionTaskSize, to),
+                    tasks.add(new Worker(cache, input, fromIndex, Math.min(fromIndex + directExecutionTaskSize, to),
                             new ArrayList<PolygonLevel>(), directExecutionTaskSize));
                 }
                 for (ForkJoinTask<List<PolygonLevel>> task : ForkJoinTask.invokeAll(tasks)) {
@@ -424,7 +485,7 @@ public class MultipolygonBuilder {
 
         List<PolygonLevel> computeDirectly() {
             for (int i = from; i < to; i++) {
-                if (processOuterWay(0, input, output, input.get(i)) == null) {
+                if (processOuterWay(0, cache, input, output, input.get(i)) == null) {
                     return null;
                 }
             }
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index d6b75bc..07eb4e1 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
@@ -18,7 +18,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.function.Predicate;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.SearchCompiler;
@@ -197,88 +196,6 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
     }
 
     /**
-     * A predicate that filters primitives that are usable.
-     * @see OsmPrimitive#isUsable()
-     * @deprecated Use {@code OsmPrimitive::isUsable} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> isUsablePredicate = OsmPrimitive::isUsable;
-
-    /**
-     * A predicate filtering primitives that are selectable.
-     * @deprecated Use {@code OsmPrimitive::isSelectable} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> isSelectablePredicate = OsmPrimitive::isSelectable;
-
-    /**
-     * A predicate filtering primitives that are not deleted.
-     * @deprecated Use {@code p -> !p.isDeleted()} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> nonDeletedPredicate = p -> !p.isDeleted();
-
-    /**
-     * A predicate filtering primitives that are not deleted and not incomplete.
-     * @deprecated use lambda instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> nonDeletedCompletePredicate =
-            primitive -> !primitive.isDeleted() && !primitive.isIncomplete();
-
-    /**
-     * A predicate filtering primitives that are not deleted and not incomplete and that are not a relation.
-     * @deprecated use lambda instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> nonDeletedPhysicalPredicate =
-            primitive -> !primitive.isDeleted() && !primitive.isIncomplete() && !(primitive instanceof Relation);
-
-    /**
-     * A predicate filtering primitives that are modified
-     * @deprecated Use {@code OsmPrimitive::isModified} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> modifiedPredicate = OsmPrimitive::isModified;
-
-    /**
-     * A predicate filtering nodes.
-     * @deprecated Use {@code Node.class::isInstance} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> nodePredicate = Node.class::isInstance;
-
-    /**
-     * A predicate filtering ways.
-     * @deprecated Use {@code Way.class::isInstance} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> wayPredicate = Way.class::isInstance;
-
-    /**
-     * A predicate filtering relations.
-     * @deprecated Use {@code Relation.class::isInstance} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> relationPredicate = Relation.class::isInstance;
-
-    /**
-     * A predicate filtering multipolygon relations.
-     * @deprecated Use {@code OsmPrimitive::isMultipolygon} instead
-     */
-    @Deprecated
-    public static final Predicate<OsmPrimitive> multipolygonPredicate = OsmPrimitive::isMultipolygon;
-
-    /**
-     * This matches all ways that have a direction
-     *
-     * @see #FLAG_HAS_DIRECTIONS
-     * @deprecated use {@code directionKeys::match}
-     */
-    @Deprecated
-    public static final Predicate<Tag> directionalKeyPredicate = directionKeys::match;
-
-    /**
      * Creates a new primitive for the given id.
      *
      * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing.
@@ -579,14 +496,32 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
 
     /**
      * Determines if this object is selectable.
+     * <p>
+     * A primitive can be selected if all conditions are met:
+     * <ul>
+     * <li>it is drawable
+     * <li>it is not disabled (greyed out) by a filter.
+     * </ul>
      * @return {@code true} if this object is selectable
      */
     public boolean isSelectable() {
-        return (flags & (FLAG_DELETED + FLAG_INCOMPLETE + FLAG_DISABLED + FLAG_HIDE_IF_DISABLED)) == 0;
+        // not synchronized -> check disabled twice just to be sure we did not have a race condition.
+        return !isDisabled() && isDrawable() && !isDisabled();
     }
 
     /**
      * Determines if this object is drawable.
+     * <p>
+     * A primitive is complete if all conditions are met:
+     * <ul>
+     * <li>type and id is known
+     * <li>tags are known
+     * <li>it is not deleted
+     * <li>it is not hidden by a filter
+     * <li>for nodes: lat/lon are known
+     * <li>for ways: all nodes are known and complete
+     * <li>for relations: all members are known and complete
+     * </ul>
      * @return {@code true} if this object is drawable
      */
     public boolean isDrawable() {
@@ -747,8 +682,7 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
         if (uninteresting == null) {
             List<String> l = new LinkedList<>(Arrays.asList(
                 "source", "source_ref", "source:", "comment",
-                "converted_by", "watch", "watch:",
-                "description", "attribution"));
+                "watch", "watch:", "description", "attribution"));
             l.addAll(getDiscardableKeys());
             l.addAll(getWorkInProgressKeys());
             uninteresting = Main.pref.getCollection("tags.uninteresting", l);
@@ -766,6 +700,7 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
             discardable = Main.pref.getCollection("tags.discardable",
                     Arrays.asList(
                             "created_by",
+                            "converted_by",
                             "geobase:datasetName",
                             "geobase:uuid",
                             "KSJ2:ADS",
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
index 3b7d440..a11f16d 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
@@ -1,97 +1,78 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
 
-import java.io.Serializable;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.comparingInt;
+
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
 
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 
 /**
- * Comparator, comparing pritimives by:<ul>
- * <li>type and ids in "quick" mode</li>
- * <li>type and objects display names instead</li>
- * </ul>
- * @since 4113
+ * Comparators for comparing primitives.
  */
-public class OsmPrimitiveComparator implements Comparator<OsmPrimitive>, Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private final HashMap<OsmPrimitive, String> cache = new HashMap<>();
-    private final boolean relationsFirst;
-    private final boolean quick;
+public final class OsmPrimitiveComparator {
 
     /**
-     * Constructs a new {@code OsmPrimitiveComparator}.
+     * Returns a comparator comparing primitives by their name using {@link DefaultNameFormatter}.
+     *
+     * {@linkplain DefaultNameFormatter#format(OsmPrimitive) Formatted names} are cached.
+     *
+     * @return a comparator comparing primitives by their name using {@link DefaultNameFormatter}
      */
-    public OsmPrimitiveComparator() {
-        this(false, false);
+    public static Comparator<OsmPrimitive> comparingNames() {
+        final Comparator<String> digitsLast = comparing(str -> Character.isDigit(str.charAt(0)) ? 1 : 0);
+        return comparing(memoize(DefaultNameFormatter.getInstance()::format),
+                digitsLast.thenComparing(AlphanumComparator.getInstance()));
     }
 
     /**
-     * Constructs a new {@code OsmPrimitiveComparator}.
-     * @param quick if {@code true}, sorts by type and ids (fast), otherwise sort by type and display names (slower)
-     * @param relationsFirst if {@code true}, always list relations first
+     * Returns a comparator comparing primitives by their {@linkplain OsmPrimitive#getUniqueId unique id}.
+     *
+     * @return a comparator comparing primitives by their {@linkplain OsmPrimitive#getUniqueId unique id}.
      */
-    public OsmPrimitiveComparator(boolean quick, boolean relationsFirst) {
-        this.quick = quick;
-        this.relationsFirst = relationsFirst;
-    }
-
-    private String cachedName(OsmPrimitive p) {
-        String name = cache.get(p);
-        if (name == null) {
-            name = p.getDisplayName(DefaultNameFormatter.getInstance());
-            cache.put(p, name);
-        }
-        return name;
+    public static Comparator<OsmPrimitive> comparingUniqueId() {
+        return comparing(OsmPrimitive::getUniqueId);
     }
 
-    private int compareName(OsmPrimitive a, OsmPrimitive b) {
-        String an = cachedName(a);
-        String bn = cachedName(b);
-        // make sure display names starting with digits are the end of the list
-        if (Character.isDigit(an.charAt(0)) && Character.isDigit(bn.charAt(0)))
-            return an.compareTo(bn);
-        else if (Character.isDigit(an.charAt(0)) && !Character.isDigit(bn.charAt(0)))
-            return 1;
-        else if (!Character.isDigit(an.charAt(0)) && Character.isDigit(bn.charAt(0)))
-            return -1;
-        return an.compareTo(bn);
+    /**
+     * Returns a comparator ordering the primitives by type in the order NODE, WAY, RELATION
+     *
+     * @return a comparator ordering the primitives by type in the order NODE, WAY, RELATION
+     */
+    public static Comparator<OsmPrimitive> orderingNodesWaysRelations() {
+        return comparingInt(osm -> osm.getType().ordinal());
     }
 
-    private static int compareId(OsmPrimitive a, OsmPrimitive b) {
-        long idA = a.getUniqueId();
-        long idB = b.getUniqueId();
-        if (idA < idB) return -1;
-        if (idA > idB) return 1;
-        return 0;
+    /**
+     * Returns a comparator ordering the primitives by type in the order WAY, RELATION, NODE
+     *
+     * @return a comparator ordering the primitives by type in the order WAY, RELATION, NODE
+     */
+    public static Comparator<OsmPrimitive> orderingWaysRelationsNodes() {
+        return comparingInt(osm -> {
+            switch (osm.getType()) {
+                case WAY:
+                    return 1;
+                case RELATION:
+                    return 2;
+                case NODE:
+                    return 3;
+                default:
+                    throw new IllegalStateException();
+            }
+        });
     }
 
-    private int compareType(OsmPrimitive a, OsmPrimitive b) {
-        if (relationsFirst) {
-            // show relations before ways, then nodes
-            if (a.getType().equals(OsmPrimitiveType.RELATION)) return -1;
-            if (a.getType().equals(OsmPrimitiveType.NODE)) return 1;
-            // a is a way
-            if (b.getType().equals(OsmPrimitiveType.RELATION)) return 1;
-            // b is a node
-        } else {
-            // show ways before relations, then nodes
-            if (a.getType().equals(OsmPrimitiveType.WAY)) return -1;
-            if (a.getType().equals(OsmPrimitiveType.NODE)) return 1;
-            // a is a relation
-            if (b.getType().equals(OsmPrimitiveType.WAY)) return 1;
-            // b is a node
-        }
-        return -1;
+    private static <T, R> Function<T, R> memoize(Function<T, R> base) {
+        final Map<T, R> cache = new HashMap<>();
+        return t -> cache.computeIfAbsent(t, base);
     }
 
-    @Override
-    public int compare(OsmPrimitive a, OsmPrimitive b) {
-        if (a.getType().equals(b.getType()))
-            return quick ? compareId(a, b) : compareName(a, b);
-        return compareType(a, b);
+    private OsmPrimitiveComparator() {
     }
 }
diff --git a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
index 541f636..e3f2509 100644
--- a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
+++ b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
@@ -500,7 +500,6 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
     class QuadBucketIterator implements Iterator<T> {
         private QBLevel<T> currentNode;
         private int contentIndex;
-        private int iteratedOver;
         QuadBuckets<T> qb;
 
         final QBLevel<T> nextContentNode(QBLevel<T> q) {
@@ -521,7 +520,6 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
             } else {
                 currentNode = nextContentNode(qb.root);
             }
-            iteratedOver = 0;
             this.qb = qb;
         }
 
@@ -553,7 +551,6 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
             if (ret == null)
                 throw new NoSuchElementException();
             contentIndex++;
-            iteratedOver++;
             return ret;
         }
 
diff --git a/src/org/openstreetmap/josm/data/osm/Relation.java b/src/org/openstreetmap/josm/data/osm/Relation.java
index ac94ce9..a86ea07 100644
--- a/src/org/openstreetmap/josm/data/osm/Relation.java
+++ b/src/org/openstreetmap/josm/data/osm/Relation.java
@@ -9,6 +9,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
@@ -71,10 +72,19 @@ public final class Relation extends OsmPrimitive implements IRelation {
         return members.length;
     }
 
+    /**
+     * Returns the relation member at the specified index.
+     * @param index the index of the relation member
+     * @return relation member at the specified index
+     */
     public RelationMember getMember(int index) {
         return members[index];
     }
 
+    /**
+     * Adds the specified relation member at the last position.
+     * @param member the member to add
+     */
     public void addMember(RelationMember member) {
         boolean locked = writeLock();
         try {
@@ -87,6 +97,11 @@ public final class Relation extends OsmPrimitive implements IRelation {
         }
     }
 
+    /**
+     * Adds the specified relation member at the specified index.
+     * @param member the member to add
+     * @param index the index at which the specified element is to be inserted
+     */
     public void addMember(int index, RelationMember member) {
         boolean locked = writeLock();
         try {
@@ -382,22 +397,26 @@ public final class Relation extends OsmPrimitive implements IRelation {
      *
      * @return the set of  {@link OsmPrimitive}s referred to by at least one
      * member of this relation
+     * @see #getMemberPrimitivesList()
      */
     public Set<OsmPrimitive> getMemberPrimitives() {
-        Set<OsmPrimitive> ret = new HashSet<>();
-        RelationMember[] members = this.members;
-        for (RelationMember m: members) {
-            if (m.getMember() != null) {
-                ret.add(m.getMember());
-            }
-        }
-        return ret;
+        return getMembers().stream().map(RelationMember::getMember).collect(Collectors.toSet());
     }
 
+    /**
+     * Returns the {@link OsmPrimitive}s of the specified type referred to by at least one member of this relation.
+     * @param tClass the type of the primitive
+     * @param <T> the type of the primitive
+     * @return the primitives
+     */
     public <T extends OsmPrimitive> Collection<T> getMemberPrimitives(Class<T> tClass) {
-        return Utils.filteredCollection(getMemberPrimitives(), tClass);
+        return Utils.filteredCollection(getMemberPrimitivesList(), tClass);
     }
 
+    /**
+     * Returns an unmodifiable list of the {@link OsmPrimitive}s referred to by at least one member of this relation.
+     * @return an unmodifiable list of the primitives
+     */
     public List<OsmPrimitive> getMemberPrimitivesList() {
         return Utils.transform(getMembers(), RelationMember::getMember);
     }
@@ -548,7 +567,7 @@ public final class Relation extends OsmPrimitive implements IRelation {
     @Override
     protected void keysChangedImpl(Map<String, String> originalKeys) {
         super.keysChangedImpl(originalKeys);
-        for (OsmPrimitive member : getMemberPrimitives()) {
+        for (OsmPrimitive member : getMemberPrimitivesList()) {
             member.clearCachedStyle();
         }
     }
diff --git a/src/org/openstreetmap/josm/data/osm/Storage.java b/src/org/openstreetmap/josm/data/osm/Storage.java
index 041b6ae..9fe8b42 100644
--- a/src/org/openstreetmap/josm/data/osm/Storage.java
+++ b/src/org/openstreetmap/josm/data/osm/Storage.java
@@ -274,7 +274,7 @@ public class Storage<T> extends AbstractSet<T> {
      * @return new hash
      */
     private static int rehash(int h) {
-        return (1103515245*h) >> 2;
+        return (1_103_515_245*h) >> 2;
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/data/osm/TagCollection.java b/src/org/openstreetmap/josm/data/osm/TagCollection.java
index 925042c..437b75c 100644
--- a/src/org/openstreetmap/josm/data/osm/TagCollection.java
+++ b/src/org/openstreetmap/josm/data/osm/TagCollection.java
@@ -323,18 +323,6 @@ public class TagCollection implements Iterable<Tag>, Serializable {
     }
 
     /**
-     * Replies true if this tag collection contains at least one tag with key <code>key</code>.
-     *
-     * @param key the key to look up
-     * @return true if this tag collection contains at least one tag with key <code>key</code>; false, otherwise
-     * @deprecated Use {@link #hasTagsFor(String)} instead.
-     */
-    @Deprecated
-    public boolean containsKey(String key) {
-        return generateStreamForKey(key).findAny().isPresent();
-    }
-
-    /**
      * Replies true if this tag collection contains all tags in <code>tags</code>. Replies
      * false, if tags is null.
      *
@@ -546,7 +534,7 @@ public class TagCollection implements Iterable<Tag>, Serializable {
      * @return the set of values
      */
     public Set<String> getValues() {
-        return tags.keySet().stream().map(e -> e.getValue()).collect(Collectors.toSet());
+        return tags.keySet().stream().map(Tag::getValue).collect(Collectors.toSet());
     }
 
     /**
@@ -559,7 +547,7 @@ public class TagCollection implements Iterable<Tag>, Serializable {
      */
     public Set<String> getValues(String key) {
         // null-safe
-        return generateStreamForKey(key).map(e -> e.getValue()).collect(Collectors.toSet());
+        return generateStreamForKey(key).map(Tag::getValue).collect(Collectors.toSet());
     }
 
     /**
@@ -748,7 +736,7 @@ public class TagCollection implements Iterable<Tag>, Serializable {
     }
 
     private Stream<String> generateKeyStream() {
-        return tags.keySet().stream().map(tag -> tag.getKey());
+        return tags.keySet().stream().map(Tag::getKey);
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
index 5ee52f2..110e4df 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
@@ -25,6 +25,8 @@ public final class MapPaintSettings implements PreferenceChangedListener {
     private int defaultSegmentWidth;
     /** Preference: should the segment numbers of ways be displayed */
     private boolean showOrderNumber;
+    /** Preference: should the segment numbers of ways be displayed on selected way */
+    private boolean showOrderNumberOnSelectedWay;
     /** Preference: should only the last arrow of a way be displayed */
     private boolean showHeadArrowOnly;
     private int showNamesDistance;
@@ -89,11 +91,12 @@ public final class MapPaintSettings implements PreferenceChangedListener {
         }
 
         showOrderNumber = Main.pref.getBoolean("draw.segment.order_number", false);
+        showOrderNumberOnSelectedWay = Main.pref.getBoolean("draw.segment.order_number.on_selected", false);
         showHeadArrowOnly = Main.pref.getBoolean("draw.segment.head_only", false);
 
-        showNamesDistance = Main.pref.getInteger("mappaint.shownames", 10000000);
-        useStrokesDistance = Main.pref.getInteger("mappaint.strokes", 10000000);
-        showIconsDistance = Main.pref.getInteger("mappaint.showicons", 10000000);
+        showNamesDistance = Main.pref.getInteger("mappaint.shownames", 10_000_000);
+        useStrokesDistance = Main.pref.getInteger("mappaint.strokes", 10_000_000);
+        showIconsDistance = Main.pref.getInteger("mappaint.showicons", 10_000_000);
 
         selectedNodeSize = Main.pref.getInteger("mappaint.node.selected-size", 5);
         unselectedNodeSize = Main.pref.getInteger("mappaint.node.unselected-size", 3);
@@ -235,6 +238,14 @@ public final class MapPaintSettings implements PreferenceChangedListener {
     }
 
     /**
+     * Determines if the segment numbers of the selected way should be displayed
+     * @return {@code true} if the segment numbers of the selected way should be displayed
+     */
+    public boolean isShowOrderNumberOnSelectedWay() {
+        return showOrderNumberOnSelectedWay;
+    }
+
+    /**
      * Specifies if only the last arrow of a way should be displayed
      * @param showHeadArrowOnly {@code true} if only the last arrow of a way should be displayed
      */
@@ -345,4 +356,23 @@ public final class MapPaintSettings implements PreferenceChangedListener {
     public boolean isOutlineOnly() {
         return outlineOnly;
     }
+
+    @Override
+    public String toString() {
+        // This is used for debugging exceptions.
+        return "MapPaintSettings [useRealWidth=" + useRealWidth + ", showDirectionArrow=" + showDirectionArrow
+                + ", showOnewayArrow=" + showOnewayArrow + ", defaultSegmentWidth=" + defaultSegmentWidth
+                + ", showOrderNumber=" + showOrderNumber + ", showHeadArrowOnly=" + showHeadArrowOnly
+                + ", showNamesDistance=" + showNamesDistance + ", useStrokesDistance=" + useStrokesDistance
+                + ", showIconsDistance=" + showIconsDistance + ", selectedNodeSize=" + selectedNodeSize
+                + ", connectionNodeSize=" + connectionNodeSize + ", unselectedNodeSize=" + unselectedNodeSize
+                + ", taggedNodeSize=" + taggedNodeSize + ", fillSelectedNode=" + fillSelectedNode
+                + ", fillUnselectedNode=" + fillUnselectedNode + ", fillTaggedNode=" + fillTaggedNode
+                + ", fillConnectionNode=" + fillConnectionNode + ", outlineOnly=" + outlineOnly + ", selectedColor="
+                + selectedColor + ", relationSelectedColor=" + relationSelectedColor + ", highlightColor="
+                + highlightColor + ", inactiveColor=" + inactiveColor + ", nodeColor=" + nodeColor + ", taggedColor="
+                + taggedColor + ", connectionColor=" + connectionColor + ", taggedConnectionColor="
+                + taggedConnectionColor + "]";
+    }
+
 }
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
index 2991f3d..7514754 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -24,6 +24,7 @@ import java.awt.geom.Path2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
+import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -62,7 +63,6 @@ import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.Poly
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.draw.MapPath2D;
 import org.openstreetmap.josm.gui.draw.MapViewPath;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -83,6 +83,7 @@ import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.AreaAndPerimeter;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
  * A map renderer which renders a map according to style rules in a set of style sheets.
@@ -242,6 +243,9 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         }
     }
 
+    /**
+     * This stores a style and a primitive that should be painted with that style.
+     */
     public static class StyleRecord implements Comparable<StyleRecord> {
         private final StyleElement style;
         private final OsmPrimitive osm;
@@ -298,6 +302,27 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         public StyleElement getStyle() {
             return style;
         }
+
+        /**
+         * Paints the primitive with the style.
+         * @param paintSettings The settings to use.
+         * @param painter The painter to paint the style.
+         */
+        public void paintPrimitive(MapPaintSettings paintSettings, StyledMapRenderer painter) {
+            style.paintPrimitive(
+                    osm,
+                    paintSettings,
+                    painter,
+                    (flags & FLAG_SELECTED) != 0,
+                    (flags & FLAG_OUTERMEMBER_OF_SELECTED) != 0,
+                    (flags & FLAG_MEMBER_OF_SELECTED) != 0
+            );
+        }
+
+        @Override
+        public String toString() {
+            return "StyleRecord [style=" + style + ", osm=" + osm + ", flags=" + flags + "]";
+        }
     }
 
     private static Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
@@ -426,18 +451,18 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         }
     }
 
-    private void displaySegments(Path2D path, Path2D orientationArrows, Path2D onewayArrows, Path2D onewayArrowsCasing,
+    private void displaySegments(MapViewPath path, Path2D orientationArrows, Path2D onewayArrows, Path2D onewayArrowsCasing,
             Color color, BasicStroke line, BasicStroke dashes, Color dashedColor) {
         g.setColor(isInactiveMode ? inactiveColor : color);
         if (useStrokes) {
             g.setStroke(line);
         }
-        g.draw(path);
+        g.draw(path.computeClippedLine(g.getStroke()));
 
         if (!isInactiveMode && useStrokes && dashes != null) {
             g.setColor(dashedColor);
             g.setStroke(dashes);
-            g.draw(path);
+            g.draw(path.computeClippedLine(dashes));
         }
 
         if (orientationArrows != null) {
@@ -805,79 +830,54 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         final double repeat = imgWidth + spacing;
         final int imgHeight = pattern.getHeight();
 
-        double currentWayLength = phase % repeat;
-        if (currentWayLength < 0) {
-            currentWayLength += repeat;
+        int dy1 = (int) ((align.getAlignmentOffset() - .5) * imgHeight);
+        int dy2 = dy1 + imgHeight;
+
+        OffsetIterator it = new OffsetIterator(way.getNodes(), offset);
+        MapViewPath path = new MapViewPath(mapState);
+        if (it.hasNext()) {
+            path.moveTo(it.next());
+        }
+        while (it.hasNext()) {
+            path.lineTo(it.next());
         }
 
-        int dy1, dy2;
-        switch (align) {
-            case TOP:
-                dy1 = 0;
-                dy2 = imgHeight;
-                break;
-            case CENTER:
-                dy1 = -imgHeight / 2;
-                dy2 = imgHeight + dy1;
-                break;
-            case BOTTOM:
-                dy1 = -imgHeight;
-                dy2 = 0;
-                break;
-            default:
-                throw new AssertionError();
+        double startOffset = phase % repeat;
+        if (startOffset < 0) {
+            startOffset += repeat;
         }
 
-        MapViewPoint lastP = null;
-        OffsetIterator it = new OffsetIterator(way.getNodes(), offset);
-        while (it.hasNext()) {
-            MapViewPoint thisP = it.next();
-
-            if (lastP != null) {
-                final double segmentLength = thisP.distanceToInView(lastP);
-
-                final double dx = thisP.getInViewX() - lastP.getInViewX();
-                final double dy = thisP.getInViewY() - lastP.getInViewY();
-
-                // pos is the position from the beginning of the current segment
-                // where an image should be painted
-                double pos = repeat - (currentWayLength % repeat);
-
-                AffineTransform saveTransform = g.getTransform();
-                g.translate(lastP.getInViewX(), lastP.getInViewY());
-                g.rotate(Math.atan2(dy, dx));
-
-                // draw the rest of the image from the last segment in case it
-                // is cut off
-                if (pos > spacing) {
-                    // segment is too short for a complete image
-                    if (pos > segmentLength + spacing) {
-                        g.drawImage(pattern.getImage(disabled), 0, dy1, (int) segmentLength, dy2,
-                                (int) (repeat - pos), 0,
-                                (int) (repeat - pos + segmentLength), imgHeight, null);
-                    } else {
-                        // rest of the image fits fully on the current segment
-                        g.drawImage(pattern.getImage(disabled), 0, dy1, (int) (pos - spacing), dy2,
-                                (int) (repeat - pos), 0, imgWidth, imgHeight, null);
-                    }
-                }
-                // draw remaining images for this segment
-                while (pos < segmentLength) {
-                    // cut off at the end?
-                    if (pos + imgWidth > segmentLength) {
-                        g.drawImage(pattern.getImage(disabled), (int) pos, dy1, (int) segmentLength, dy2,
-                                0, 0, (int) segmentLength - (int) pos, imgHeight, null);
-                    } else {
-                        g.drawImage(pattern.getImage(disabled), (int) pos, dy1, nc);
-                    }
-                    pos += repeat;
-                }
-                g.setTransform(saveTransform);
+        BufferedImage image = pattern.getImage(disabled);
 
-                currentWayLength += segmentLength;
+        path.visitClippedLine(startOffset, repeat, (inLineOffset, start, end, startIsOldEnd) -> {
+            final double segmentLength = start.distanceToInView(end);
+            if (segmentLength < 0.1) {
+                // avoid odd patterns when zoomed out.
+                return;
             }
-            lastP = thisP;
-        }
+            if (segmentLength > repeat * 500) {
+                // simply skip drawing so many images - something must be wrong.
+                return;
+            }
+            AffineTransform saveTransform = g.getTransform();
+            g.translate(start.getInViewX(), start.getInViewY());
+            double dx = end.getInViewX() - start.getInViewX();
+            double dy = end.getInViewY() - start.getInViewY();
+            g.rotate(Math.atan2(dy, dx));
+
+            // The start of the next image
+            double imageStart = -(inLineOffset % repeat);
+
+            while (imageStart < segmentLength) {
+                int x = (int) imageStart;
+                int sx1 = Math.max(0, -x);
+                int sx2 = imgWidth - Math.max(0, x + imgWidth - (int) Math.ceil(segmentLength));
+                g.drawImage(image, x + sx1, dy1, x + sx2, dy2, sx1, 0, sx2, imgHeight, null);
+                imageStart += repeat;
+            }
+
+            g.setTransform(saveTransform);
+        });
     }
 
     @Override
@@ -1005,7 +1005,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
      * @param path path to draw
      * @param line line style
      */
-    private void drawPathHighlight(Path2D path, BasicStroke line) {
+    private void drawPathHighlight(MapViewPath path, BasicStroke line) {
         if (path == null)
             return;
         g.setColor(highlightColorTransparent);
@@ -1422,17 +1422,16 @@ public class StyledMapRenderer extends AbstractMapRenderer {
             boolean showOrientation, boolean showHeadArrowOnly,
             boolean showOneway, boolean onewayReversed) {
 
-        MapPath2D path = new MapPath2D();
-        MapPath2D orientationArrows = showOrientation ? new MapPath2D() : null;
-        MapPath2D onewayArrows = showOneway ? new MapPath2D() : null;
-        MapPath2D onewayArrowsCasing = showOneway ? new MapPath2D() : null;
+        MapViewPath path = new MapViewPath(mapState);
+        MapViewPath orientationArrows = showOrientation ? new MapViewPath(mapState) : null;
+        MapViewPath onewayArrows;
+        MapViewPath onewayArrowsCasing;
         Rectangle bounds = g.getClipBounds();
         if (bounds != null) {
             // avoid arrow heads at the border
             bounds.grow(100, 100);
         }
 
-        boolean initialMoveToNeeded = true;
         List<Node> wayNodes = way.getNodes();
         if (wayNodes.size() < 2) return;
 
@@ -1455,8 +1454,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         }
 
         MapViewPoint lastPoint = null;
-        double wayLength = 0;
         Iterator<MapViewPoint> it = new OffsetIterator(wayNodes, offset);
+        boolean initialMoveToNeeded = true;
         while (it.hasNext()) {
             MapViewPoint p = it.next();
             if (lastPoint != null) {
@@ -1475,27 +1474,35 @@ public class StyledMapRenderer extends AbstractMapRenderer {
                     ArrowPaintHelper drawHelper = new ArrowPaintHelper(PHI, 10 + line.getLineWidth());
                     drawHelper.paintArrowAt(orientationArrows, p2, p1);
                 }
-                if (showOneway) {
-                    final double segmentLength = p1.distanceToInView(p2);
-                    if (segmentLength != 0) {
-                        final double nx = (p2.getInViewX() - p1.getInViewX()) / segmentLength;
-                        final double ny = (p2.getInViewY() - p1.getInViewY()) / segmentLength;
-
-                        final double interval = 60;
-                        // distance from p1
-                        double dist = interval - (wayLength % interval);
-
-                        while (dist < segmentLength) {
-                            appenOnewayPath(onewayReversed, p1, nx, ny, dist, 3d, onewayArrowsCasing);
-                            appenOnewayPath(onewayReversed, p1, nx, ny, dist, 2d, onewayArrows);
-                            dist += interval;
-                        }
-                    }
-                    wayLength += segmentLength;
-                }
             }
             lastPoint = p;
         }
+        if (showOneway) {
+            onewayArrows = new MapViewPath(mapState);
+            onewayArrowsCasing = new MapViewPath(mapState);
+            double interval = 60;
+
+            path.visitClippedLine(0, 60, (inLineOffset, start, end, startIsOldEnd) -> {
+                double segmentLength = start.distanceToInView(end);
+                if (segmentLength > 0.001) {
+                    final double nx = (end.getInViewX() - start.getInViewX()) / segmentLength;
+                    final double ny = (end.getInViewY() - start.getInViewY()) / segmentLength;
+
+                    // distance from p1
+                    double dist = interval - (inLineOffset % interval);
+
+                    while (dist < segmentLength) {
+                        appenOnewayPath(onewayReversed, start, nx, ny, dist, 3d, onewayArrowsCasing);
+                        appenOnewayPath(onewayReversed, start, nx, ny, dist, 2d, onewayArrows);
+                        dist += interval;
+                    }
+                }
+            });
+        } else {
+            onewayArrows = null;
+            onewayArrowsCasing = null;
+        }
+
         if (way.isHighlighted()) {
             drawPathHighlight(path, line);
         }
@@ -1789,7 +1796,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         private final transient ElemStyles styles = MapPaintStyles.getStyles();
         private final int directExecutionTaskSize;
 
-        private final boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10000000);
+        private final boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10_000_000);
         private final boolean drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
         private final boolean drawRestriction = Main.pref.getBoolean("mappaint.restriction", true);
 
@@ -1828,16 +1835,26 @@ public class StyledMapRenderer extends AbstractMapRenderer {
             MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
             try {
                 for (final OsmPrimitive osm : input) {
-                    if (osm.isDrawable()) {
-                        osm.accept(this);
-                    }
+                    acceptDrawable(osm);
                 }
                 return output;
+            } catch (RuntimeException e) {
+                throw BugReport.intercept(e).put("input-size", input.size()).put("output-size", output.size());
             } finally {
                 MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();
             }
         }
 
+        private void acceptDrawable(final OsmPrimitive osm) {
+            try {
+                if (osm.isDrawable()) {
+                    osm.accept(this);
+                }
+            } catch (RuntimeException e) {
+                throw BugReport.intercept(e).put("osm", osm);
+            }
+        }
+
         @Override
         public void visit(Node n) {
             add(n, computeFlags(n, false));
@@ -1934,22 +1951,30 @@ public class StyledMapRenderer extends AbstractMapRenderer {
                 return;
             }
 
-            for (StyleRecord r : allStyleElems) {
-                r.style.paintPrimitive(
-                        r.osm,
-                        paintSettings,
-                        this,
-                        (r.flags & FLAG_SELECTED) != 0,
-                        (r.flags & FLAG_OUTERMEMBER_OF_SELECTED) != 0,
-                        (r.flags & FLAG_MEMBER_OF_SELECTED) != 0
-                );
+            for (StyleRecord record : allStyleElems) {
+                paintRecord(record);
             }
 
             drawVirtualNodes(data, bbox);
 
             benchmark.renderDone();
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e)
+                    .put("data", data)
+                    .put("circum", circum)
+                    .put("scale", scale)
+                    .put("paintSettings", paintSettings)
+                    .put("renderVirtualNodes", renderVirtualNodes);
         } finally {
             data.getReadLock().unlock();
         }
     }
+
+    private void paintRecord(StyleRecord record) {
+        try {
+            record.paintPrimitive(paintSettings, this);
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("record", record);
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
index 214b38d..6835a30 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
@@ -59,6 +59,8 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
     protected boolean showHeadArrowOnly;
     /** Preference: should the segment numbers of ways be displayed */
     protected boolean showOrderNumber;
+    /** Preference: should the segment numbers of the selected be displayed */
+    protected boolean showOrderNumberOnSelectedWay;
     /** Preference: should selected nodes be filled */
     protected boolean fillSelectedNode;
     /** Preference: should unselected nodes be filled */
@@ -133,6 +135,7 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
         showOnewayArrow = settings.isShowOnewayArrow();
         showHeadArrowOnly = settings.isShowHeadArrowOnly();
         showOrderNumber = settings.isShowOrderNumber();
+        showOrderNumberOnSelectedWay = settings.isShowOrderNumberOnSelectedWay();
         selectedNodeSize = settings.getSelectedNodeSize();
         unselectedNodeSize = settings.getUnselectedNodeSize();
         connectionNodeSize = settings.getConnectionNodeSize();
@@ -320,7 +323,7 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
                 if ((pOutside & lastPOutside) == 0) {
                     drawSegment(lastP, p, wayColor,
                             showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
-                    if (showOrderNumber && !isInactiveMode) {
+                    if ((showOrderNumber || (showOrderNumberOnSelectedWay && w.isSelected())) && !isInactiveMode) {
                         drawOrderNumber(lastP, p, orderNumber, g.getColor());
                     }
                 }
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
index 16650ca..9ad9eaa 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
@@ -211,7 +211,12 @@ public final class MultipolygonCache implements DataSetListener, LayerChangeList
                     if (event instanceof NodeMovedEvent) {
                         pd.nodeMoved((NodeMovedEvent) event);
                     } else if (event instanceof WayNodesChangedEvent) {
+                        final boolean oldClosedStatus = pd.isClosed();
                         pd.wayNodesChanged((WayNodesChangedEvent) event);
+                        if (pd.isClosed() != oldClosedStatus) {
+                            removeMultipolygonFrom(r, maps); // see ticket #13591
+                            return;
+                        }
                     }
                 }
             }
@@ -223,7 +228,7 @@ public final class MultipolygonCache implements DataSetListener, LayerChangeList
             map.remove(r);
         }
         // Erase style cache for polygon members
-        for (OsmPrimitive member : r.getMemberPrimitives()) {
+        for (OsmPrimitive member : r.getMemberPrimitivesList()) {
             member.clearCachedStyle();
         }
     }
diff --git a/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java b/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
index a87ad31..9da9719 100644
--- a/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
@@ -69,6 +69,7 @@ public abstract class AbstractProperty<T> {
      * @param <T> property type
      * @since 10824
      */
+    @FunctionalInterface
     public interface ValueChangeListener<T> {
         /**
          * Method called when a property value has changed.
diff --git a/src/org/openstreetmap/josm/data/projection/CustomProjection.java b/src/org/openstreetmap/josm/data/projection/CustomProjection.java
index 8a009b5..0121d31 100644
--- a/src/org/openstreetmap/josm/data/projection/CustomProjection.java
+++ b/src/org/openstreetmap/josm/data/projection/CustomProjection.java
@@ -264,8 +264,8 @@ public class CustomProjection extends AbstractProjection {
                     throw new ProjectionConfigurationException(tr("Expected integer value in range 1-60 for ''+zone=...'' parameter."));
                 this.lon0 = 6d * zone - 183d;
                 this.k0 = 0.9996;
-                this.x0 = 500000;
-                this.y0 = parameters.containsKey(Param.south.key) ? 10000000 : 0;
+                this.x0 = 500_000;
+                this.y0 = parameters.containsKey(Param.south.key) ? 10_000_000 : 0;
             }
             String s = parameters.get(Param.x_0.key);
             if (s != null) {
diff --git a/src/org/openstreetmap/josm/data/projection/Projections.java b/src/org/openstreetmap/josm/data/projection/Projections.java
index d97b7b0..6f6dd99 100644
--- a/src/org/openstreetmap/josm/data/projection/Projections.java
+++ b/src/org/openstreetmap/josm/data/projection/Projections.java
@@ -3,9 +3,6 @@ package org.openstreetmap.josm.data.projection;
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -271,8 +268,7 @@ public final class Projections {
     public static List<ProjectionDefinition> loadProjectionDefinitions(String path) throws IOException {
         try (
             CachedFile cf = new CachedFile(path);
-            InputStream in = cf.getInputStream();
-            BufferedReader r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+            BufferedReader r = cf.getContentReader()
         ) {
             return loadProjectionDefinitions(r);
         }
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
index 3348277..3059938 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
@@ -97,7 +97,7 @@ public final class NTV2Util {
             i = getIntLE(b, 4);
             j = getIntLE(b, 0);
         }
-        long l = ((long) i << 32) | (j & 0x00000000FFFFFFFFL);
+        long l = ((long) i << 32) | (j & 0x0000_0000_FFFF_FFFFL);
         return Double.longBitsToDouble(l);
     }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/FixableTestError.java b/src/org/openstreetmap/josm/data/validation/FixableTestError.java
deleted file mode 100644
index 458a3bb..0000000
--- a/src/org/openstreetmap/josm/data/validation/FixableTestError.java
+++ /dev/null
@@ -1,122 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.validation;
-
-import java.util.Collection;
-
-import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-
-/**
- * Validation error easily fixable right at its detection. The fix can be given when constructing the error.
- * @since 6377
- */
-public class FixableTestError extends TestError {
-    protected final Command fix;
-
-    /**
-     * Constructs a new {@code FixableTestError} for a single primitive.
-     * @param tester The tester
-     * @param severity The severity of this error
-     * @param message The error message
-     * @param code The test error reference code
-     * @param primitive The affected primitive
-     * @param fix The command used to fix the error
-     */
-    public FixableTestError(Test tester, Severity severity, String message, int code, OsmPrimitive primitive, Command fix) {
-        super(tester, severity, message, code, primitive);
-        this.fix = fix;
-    }
-
-    /**
-     * Constructs a new {@code FixableTestError} for multiple primitives.
-     * @param tester The tester
-     * @param severity The severity of this error
-     * @param message The error message
-     * @param code The test error reference code
-     * @param primitives The affected primitives
-     * @param fix The command used to fix the error
-     */
-    public FixableTestError(Test tester, Severity severity, String message, int code, Collection<? extends OsmPrimitive> primitives,
-            Command fix) {
-        super(tester, severity, message, code, primitives);
-        this.fix = fix;
-    }
-
-    /**
-     * Constructs a new {@code FixableTestError} for multiple primitives.
-     * @param tester The tester
-     * @param severity The severity of this error
-     * @param message The error message
-     * @param code The test error reference code
-     * @param primitives The affected primitives
-     * @param highlighted OSM primitives to highlight
-     * @param fix The command used to fix the error
-     */
-    public FixableTestError(Test tester, Severity severity, String message, int code, Collection<? extends OsmPrimitive> primitives,
-            Collection<?> highlighted, Command fix) {
-        super(tester, severity, message, code, primitives, highlighted);
-        this.fix = fix;
-    }
-
-    /**
-     * Constructs a new {@code FixableTestError} for a single primitive.
-     * @param tester The tester
-     * @param severity The severity of this error
-     * @param message The error message
-     * @param description The translated description
-     * @param descriptionEn The English description
-     * @param code The test error reference code
-     * @param primitive The affected primitive
-     * @param fix The command used to fix the error
-     */
-    public FixableTestError(Test tester, Severity severity, String message, String description, String descriptionEn, int code,
-            OsmPrimitive primitive, Command fix) {
-        super(tester, severity, message, description, descriptionEn, code, primitive);
-        this.fix = fix;
-    }
-
-    /**
-     * Constructs a new {@code FixableTestError} for multiple primitives.
-     * @param tester The tester
-     * @param severity The severity of this error
-     * @param message The error message
-     * @param description The translated description
-     * @param descriptionEn The English description
-     * @param code The test error reference code
-     * @param primitives The affected primitives
-     * @param fix The command used to fix the error
-     */
-    public FixableTestError(Test tester, Severity severity, String message, String description, String descriptionEn, int code,
-            Collection<? extends OsmPrimitive> primitives, Command fix) {
-        super(tester, severity, message, description, descriptionEn, code, primitives);
-        this.fix = fix;
-    }
-
-    /**
-     * Constructs a new {@code FixableTestError} for multiple primitives.
-     * @param tester The tester
-     * @param severity The severity of this error
-     * @param message The error message
-     * @param description The translated description
-     * @param descriptionEn The English description
-     * @param code The test error reference code
-     * @param primitives The affected primitives
-     * @param highlighted OSM primitives to highlight
-     * @param fix The command used to fix the error
-     */
-    public FixableTestError(Test tester, Severity severity, String message, String description, String descriptionEn, int code,
-            Collection<? extends OsmPrimitive> primitives, Collection<?> highlighted, Command fix) {
-        super(tester, severity, message, description, descriptionEn, code, primitives, highlighted);
-        this.fix = fix;
-    }
-
-    @Override
-    public Command getFix() {
-        return fix;
-    }
-
-    @Override
-    public final boolean isFixable() {
-        return true;
-    }
-}
diff --git a/src/org/openstreetmap/josm/data/validation/OsmValidator.java b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
index 86dad1e..db1053f 100644
--- a/src/org/openstreetmap/josm/data/validation/OsmValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
@@ -104,6 +104,7 @@ public final class OsmValidator {
         CrossingWays.Ways.class, // ID  601 ..  699
         CrossingWays.Boundaries.class, // ID  601 ..  699
         CrossingWays.Barrier.class, // ID  601 ..  699
+        CrossingWays.SelfCrossing.class, // ID  601 ..  699
         SimilarNamedWays.class, // ID  701 ..  799
         Coastlines.class, // ID  901 ..  999
         WronglyOrderedWays.class, // ID 1001 .. 1099
@@ -182,7 +183,7 @@ public final class OsmValidator {
         ignoredErrors.clear();
         if (ValidatorPreference.PREF_USE_IGNORE.get()) {
             Path path = Paths.get(getValidatorDir()).resolve("ignorederrors");
-            if (Files.exists(path)) {
+            if (path.toFile().exists()) {
                 try {
                     ignoredErrors.addAll(Files.readAllLines(path, StandardCharsets.UTF_8));
                 } catch (final FileNotFoundException e) {
@@ -292,7 +293,7 @@ public final class OsmValidator {
     public static void initializeGridDetail() {
         String code = Main.getProjection().toCode();
         if (Arrays.asList(ProjectionPreference.wgs84.allCodes()).contains(code)) {
-            OsmValidator.griddetail = 10000;
+            OsmValidator.griddetail = 10_000;
         } else if (Arrays.asList(ProjectionPreference.mercator.allCodes()).contains(code)) {
             OsmValidator.griddetail = 0.01;
         } else if (Arrays.asList(ProjectionPreference.lambert.allCodes()).contains(code)) {
diff --git a/src/org/openstreetmap/josm/data/validation/Test.java b/src/org/openstreetmap/josm/data/validation/Test.java
index c6cbff4..1b67069 100644
--- a/src/org/openstreetmap/josm/data/validation/Test.java
+++ b/src/org/openstreetmap/josm/data/validation/Test.java
@@ -116,7 +116,7 @@ public class Test extends AbstractVisitor {
          * Checks the tags of the given primitive.
          * @param p The primitive to test
          */
-        public abstract void check(final OsmPrimitive p);
+        public abstract void check(OsmPrimitive p);
 
         @Override
         public void visit(Node n) {
diff --git a/src/org/openstreetmap/josm/data/validation/TestError.java b/src/org/openstreetmap/josm/data/validation/TestError.java
index 9379629..903df26 100644
--- a/src/org/openstreetmap/josm/data/validation/TestError.java
+++ b/src/org/openstreetmap/josm/data/validation/TestError.java
@@ -1,11 +1,15 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.TreeSet;
+import java.util.function.Supplier;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
@@ -25,6 +29,8 @@ import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
 import org.openstreetmap.josm.tools.AlphanumComparator;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.I18n;
 
 /**
  * Validation error
@@ -38,18 +44,211 @@ public class TestError implements Comparable<TestError>, DataSetListener {
     /** The error message */
     private String message;
     /** Deeper error description */
-    private String description;
-    private String descriptionEn;
+    private final String description;
+    private final String descriptionEn;
     /** The affected primitives */
     private Collection<? extends OsmPrimitive> primitives;
     /** The primitives or way segments to be highlighted */
-    private Collection<?> highlighted;
+    private final Collection<?> highlighted;
     /** The tester that raised this error */
     private Test tester;
     /** Internal code used by testers to classify errors */
-    private int code;
+    private final int code;
     /** If this error is selected */
     private boolean selected;
+    /** Supplying a command to fix the error */
+    private final Supplier<Command> fixingCommand;
+
+    /**
+     * A builder for a {@code TestError}.
+     * @since 11129
+     */
+    public static final class Builder {
+        private final Test tester;
+        private final Severity severity;
+        private final int code;
+        private String message;
+        private String description;
+        private String descriptionEn;
+        private Collection<? extends OsmPrimitive> primitives;
+        private Collection<?> highlighted;
+        private Supplier<Command> fixingCommand;
+
+        Builder(Test tester, Severity severity, int code) {
+            this.tester = tester;
+            this.severity = severity;
+            this.code = code;
+        }
+
+        /**
+         * Sets the error message.
+         *
+         * @param message The error message
+         * @return {@code this}
+         */
+        public Builder message(String message) {
+            this.message = message;
+            return this;
+        }
+
+        /**
+         * Sets the error message.
+         *
+         * @param message       The the message of this error group
+         * @param description   The translated description of this error
+         * @param descriptionEn The English description (for ignoring errors)
+         * @return {@code this}
+         */
+        public Builder messageWithManuallyTranslatedDescription(String message, String description, String descriptionEn) {
+            this.message = message;
+            this.description = description;
+            this.descriptionEn = descriptionEn;
+            return this;
+        }
+
+        /**
+         * Sets the error message.
+         *
+         * @param message The the message of this error group
+         * @param marktrDescription The {@linkplain I18n#marktr prepared for i18n} description of this error
+         * @param args The description arguments to be applied in {@link I18n#tr(String, Object...)}
+         * @return {@code this}
+         */
+        public Builder message(String message, String marktrDescription, Object... args) {
+            this.message = message;
+            this.description = I18n.tr(marktrDescription, args);
+            this.descriptionEn = new MessageFormat(marktrDescription, Locale.ENGLISH).format(args);
+            return this;
+        }
+
+        /**
+         * Sets the primitives affected by this error.
+         *
+         * @param primitives the primitives affected by this error
+         * @return {@code this}
+         */
+        public Builder primitives(OsmPrimitive... primitives) {
+            return primitives(Arrays.asList(primitives));
+        }
+
+        /**
+         * Sets the primitives affected by this error.
+         *
+         * @param primitives the primitives affected by this error
+         * @return {@code this}
+         */
+        public Builder primitives(Collection<? extends OsmPrimitive> primitives) {
+            CheckParameterUtil.ensureThat(this.primitives == null, "primitives already set");
+            CheckParameterUtil.ensureParameterNotNull(primitives, "primitives");
+            this.primitives = primitives;
+            if (this.highlighted == null) {
+                this.highlighted = primitives;
+            }
+            return this;
+        }
+
+        /**
+         * Sets the primitives to highlight when selecting this error.
+         *
+         * @param highlighted the primitives to highlight
+         * @return {@code this}
+         * @see ValidatorVisitor#visit(OsmPrimitive)
+         */
+        public Builder highlight(OsmPrimitive... highlighted) {
+            return highlight(Arrays.asList(highlighted));
+        }
+
+        /**
+         * Sets the primitives to highlight when selecting this error.
+         *
+         * @param highlighted the primitives to highlight
+         * @return {@code this}
+         * @see ValidatorVisitor#visit(OsmPrimitive)
+         */
+        public Builder highlight(Collection<? extends OsmPrimitive> highlighted) {
+            CheckParameterUtil.ensureParameterNotNull(highlighted, "highlighted");
+            this.highlighted = highlighted;
+            return this;
+        }
+
+        /**
+         * Sets the way segments to highlight when selecting this error.
+         *
+         * @param highlighted the way segments to highlight
+         * @return {@code this}
+         * @see ValidatorVisitor#visit(WaySegment)
+         */
+        public Builder highlightWaySegments(Collection<WaySegment> highlighted) {
+            CheckParameterUtil.ensureParameterNotNull(highlighted, "highlighted");
+            this.highlighted = highlighted;
+            return this;
+        }
+
+        /**
+         * Sets the node pairs to highlight when selecting this error.
+         *
+         * @param highlighted the node pairs to highlight
+         * @return {@code this}
+         * @see ValidatorVisitor#visit(List)
+         */
+        public Builder highlightNodePairs(Collection<List<Node>> highlighted) {
+            CheckParameterUtil.ensureParameterNotNull(highlighted, "highlighted");
+            this.highlighted = highlighted;
+            return this;
+        }
+
+        /**
+         * Sets a supplier to obtain a command to fix the error.
+         *
+         * @param fixingCommand the fix supplier
+         * @return {@code this}
+         */
+        public Builder fix(Supplier<Command> fixingCommand) {
+            CheckParameterUtil.ensureThat(this.fixingCommand == null, "fixingCommand already set");
+            this.fixingCommand = fixingCommand;
+            return this;
+        }
+
+        /**
+         * Returns a new test error with the specified values
+         *
+         * @return a new test error with the specified values
+         * @throws IllegalArgumentException when {@link #message} or {@link #primitives} is null/empty.
+         */
+        public TestError build() {
+            CheckParameterUtil.ensureParameterNotNull(message, "message not set");
+            CheckParameterUtil.ensureParameterNotNull(primitives, "primitives not set");
+            CheckParameterUtil.ensureThat(!primitives.isEmpty(), "primitives is empty");
+            if (this.highlighted == null) {
+                this.highlighted = Collections.emptySet();
+            }
+            return new TestError(this);
+        }
+    }
+
+    /**
+     * Starts building a new {@code TestError}
+     * @param tester The tester
+     * @param severity The severity of this error
+     * @param code The test error reference code
+     * @return a new test builder
+     * @since 11129
+     */
+    public static Builder builder(Test tester, Severity severity, int code) {
+        return new Builder(tester, severity, code);
+    }
+
+    TestError(Builder builder) {
+        this.tester = builder.tester;
+        this.severity = builder.severity;
+        this.message = builder.message;
+        this.description = builder.description;
+        this.descriptionEn = builder.descriptionEn;
+        this.primitives = builder.primitives;
+        this.highlighted = builder.highlighted;
+        this.code = builder.code;
+        this.fixingCommand = builder.fixingCommand;
+    }
 
     /**
      * Constructs a new {@code TestError}.
@@ -61,7 +260,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
      * @param code The test error reference code
      * @param primitives The affected primitives
      * @param highlighted OSM primitives to highlight
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public TestError(Test tester, Severity severity, String message, String description, String descriptionEn,
             int code, Collection<? extends OsmPrimitive> primitives, Collection<?> highlighted) {
         this.tester = tester;
@@ -72,6 +273,7 @@ public class TestError implements Comparable<TestError>, DataSetListener {
         this.primitives = primitives;
         this.highlighted = highlighted;
         this.code = code;
+        this.fixingCommand = null;
     }
 
     /**
@@ -82,7 +284,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
      * @param code The test error reference code
      * @param primitives The affected primitives
      * @param highlighted OSM primitives to highlight
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public TestError(Test tester, Severity severity, String message, int code, Collection<? extends OsmPrimitive> primitives,
             Collection<?> highlighted) {
         this(tester, severity, message, null, null, code, primitives, highlighted);
@@ -97,7 +301,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
      * @param descriptionEn The English description
      * @param code The test error reference code
      * @param primitives The affected primitives
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public TestError(Test tester, Severity severity, String message, String description, String descriptionEn,
             int code, Collection<? extends OsmPrimitive> primitives) {
         this(tester, severity, message, description, descriptionEn, code, primitives, primitives);
@@ -110,7 +316,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
      * @param message The error message
      * @param code The test error reference code
      * @param primitives The affected primitives
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public TestError(Test tester, Severity severity, String message, int code, Collection<? extends OsmPrimitive> primitives) {
         this(tester, severity, message, null, null, code, primitives, primitives);
     }
@@ -122,7 +330,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
      * @param message The error message
      * @param code The test error reference code
      * @param primitive The affected primitive
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public TestError(Test tester, Severity severity, String message, int code, OsmPrimitive primitive) {
         this(tester, severity, message, null, null, code, Collections.singletonList(primitive), Collections
                 .singletonList(primitive));
@@ -137,7 +347,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
      * @param descriptionEn The English description
      * @param code The test error reference code
      * @param primitive The affected primitive
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public TestError(Test tester, Severity severity, String message, String description, String descriptionEn,
             int code, OsmPrimitive primitive) {
         this(tester, severity, message, description, descriptionEn, code, Collections.singletonList(primitive));
@@ -162,7 +374,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
     /**
      * Sets the error message
      * @param message The error message
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public void setMessage(String message) {
         this.message = message;
     }
@@ -191,8 +405,10 @@ public class TestError implements Comparable<TestError>, DataSetListener {
 
     /**
      * Sets the list of primitives affected by this error
-     * @param primitives the list of primitives affected by this error
+     * @param primitives the list of primitives affected by this error*
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public void setPrimitives(List<? extends OsmPrimitive> primitives) {
         this.primitives = primitives;
     }
@@ -208,7 +424,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
     /**
      * Sets the severity of this error
      * @param severity the severity of this error
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public void setSeverity(Severity severity) {
         this.severity = severity;
     }
@@ -271,7 +489,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
     /**
      * Set the tester that raised the error.
      * @param tester te tester
+     * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
      */
+    @Deprecated
     public void setTester(Test tester) {
         this.tester = tester;
     }
@@ -290,7 +510,7 @@ public class TestError implements Comparable<TestError>, DataSetListener {
      * @return true if the error can be fixed
      */
     public boolean isFixable() {
-        return tester != null && tester.isFixable(this);
+        return fixingCommand != null || ((tester != null) && tester.isFixable(this));
     }
 
     /**
@@ -299,6 +519,13 @@ public class TestError implements Comparable<TestError>, DataSetListener {
      * @return The command to fix the error
      */
     public Command getFix() {
+        // obtain fix from the error
+        final Command fix = fixingCommand != null ? fixingCommand.get() : null;
+        if (fix != null) {
+            return fix;
+        }
+
+        // obtain fix from the tester
         if (tester == null || !tester.isFixable(this) || primitives.isEmpty())
             return null;
 
diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
index d8b75b1..5ee9a6e 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -291,7 +291,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 2016083001, Last Updated Wed Aug 31 07:07:01 2016 UTC
+        // Taken from Version 2016110401, Last Updated Sat Nov  5 07:07:01 2016 UTC
         "aaa", // aaa American Automobile Association, Inc.
         "aarp", // aarp AARP
         "abarth", // abarth Fiat Chrysler Automobiles N.V.
@@ -343,6 +343,7 @@ public final class DomainValidator extends AbstractValidator {
         "android", // android Charleston Road Registry Inc.
         "anquan", // anquan QIHOO 360 TECHNOLOGY CO. LTD.
         "anz", // anz Australia and New Zealand Banking Group Limited
+        "aol", // aol AOL Inc.
         "apartments", // apartments June Maple, LLC
         "app", // app Charleston Road Registry Inc.
         "apple", // apple Apple Inc.
@@ -381,6 +382,8 @@ public final class DomainValidator extends AbstractValidator {
         "barclays", // barclays Barclays Bank PLC
         "barefoot", // barefoot Gallo Vineyards, Inc.
         "bargains", // bargains Half Hallow, LLC
+        "baseball", // baseball MLB Advanced Media DH, LLC
+        "basketball", // basketball Fédération Internationale de Basketball (FIBA)
         "bauhaus", // bauhaus Werkhaus GmbH
         "bayern", // bayern Bayern Connect GmbH
         "bbc", // bbc British Broadcasting Corporation
@@ -464,6 +467,8 @@ public final class DomainValidator extends AbstractValidator {
         "cars", // cars Uniregistry, Corp.
         "cartier", // cartier Richemont DNS Inc.
         "casa", // casa Top Level Domain Holdings Limited
+        "case", // case CNH Industrial N.V.
+        "caseih", // caseih CNH Industrial N.V.
         "cash", // cash Delta Lake, LLC
         "casino", // casino Binky Sky, LLC
         "cat", // cat Fundacio puntCAT
@@ -595,6 +600,7 @@ public final class DomainValidator extends AbstractValidator {
         "dupont", // dupont E. I. du Pont de Nemours and Company
         "durban", // durban ZA Central Registry NPC trading as ZA Central Registry
         "dvag", // dvag Deutsche Vermögensberatung Aktiengesellschaft DVAG
+        "dvr", // dvr Hughes Satellite Systems Corporation
         "earth", // earth Interlink Co., Ltd.
         "eat", // eat Charleston Road Registry Inc.
         "eco", // eco Big Room Inc.
@@ -641,6 +647,7 @@ public final class DomainValidator extends AbstractValidator {
         "ferrero", // ferrero Ferrero Trading Lux S.A.
         "fiat", // fiat Fiat Chrysler Automobiles N.V.
         "fidelity", // fidelity Fidelity Brokerage Services LLC
+        "fido", // fido Rogers Communications Canada Inc.
         "film", // film Motion Picture Domain Registry Pty Ltd
         "final", // final Núcleo de Informação e Coordenação do Ponto BR - NIC.br
         "finance", // finance Cotton Cypress, LLC
@@ -804,6 +811,7 @@ public final class DomainValidator extends AbstractValidator {
         "istanbul", // istanbul Istanbul Metropolitan Municipality / Medya A.S.
         "itau", // itau Itau Unibanco Holding S.A.
         "itv", // itv ITV Services Limited
+        "iveco", // iveco CNH Industrial N.V.
         "iwc", // iwc Richemont DNS Inc.
         "jaguar", // jaguar Jaguar Land Rover Ltd
         "java", // java Oracle Corporation
@@ -951,6 +959,7 @@ public final class DomainValidator extends AbstractValidator {
         "mom", // mom Uniregistry, Corp.
         "monash", // monash Monash University
         "money", // money Outer McCook, LLC
+        "monster", // monster Monster Worldwide, Inc.
         "montblanc", // montblanc Richemont DNS Inc.
         "mopar", // mopar FCA US LLC.
         "mormon", // mormon IRI Domain Management, LLC ("Applicant")
@@ -982,6 +991,7 @@ public final class DomainValidator extends AbstractValidator {
         "network", // network Trixy Manor, LLC
         "neustar", // neustar NeuStar, Inc.
         "new", // new Charleston Road Registry Inc.
+        "newholland", // newholland CNH Industrial N.V.
         "news", // news United TLD Holdco Ltd.
         "next", // next Next plc
         "nextdirect", // nextdirect Next plc
@@ -1006,6 +1016,7 @@ public final class DomainValidator extends AbstractValidator {
         "ntt", // ntt NIPPON TELEGRAPH AND TELEPHONE CORPORATION
         "nyc", // nyc The City of New York by and through the New York City Department of Information Technology & Telecommunications
         "obi", // obi OBI Group Holding SE & Co. KGaA
+        "observer", // observer Top Level Spectrum, Inc.
         "off", // off Johnson Shareholdings, Inc.
         "office", // office Microsoft Corporation
         "okinawa", // okinawa BusinessRalliart inc.
@@ -1094,6 +1105,7 @@ public final class DomainValidator extends AbstractValidator {
         "quest", // quest Quest ION Limited
         "qvc", // qvc QVC, Inc.
         "racing", // racing Premier Registry Limited
+        "radio", // radio European Broadcasting Union (EBU)
         "raid", // raid Johnson Shareholdings, Inc.
         "read", // read Amazon Registry Services, Inc.
         "realestate", // realestate dotRealEstate LLC
@@ -1127,6 +1139,7 @@ public final class DomainValidator extends AbstractValidator {
         "rocher", // rocher Ferrero Trading Lux S.A.
         "rocks", // rocks United TLD Holdco, LTD.
         "rodeo", // rodeo Top Level Domain Holdings Limited
+        "rogers", // rogers Rogers Communications Canada Inc.
         "room", // room Amazon Registry Services, Inc.
         "rsvp", // rsvp Charleston Road Registry Inc.
         "ruhr", // ruhr regiodot GmbH & Co. KG
@@ -1340,6 +1353,7 @@ public final class DomainValidator extends AbstractValidator {
         "vlaanderen", // vlaanderen DNS.be vzw
         "vodka", // vodka Top Level Domain Holdings Limited
         "volkswagen", // volkswagen Volkswagen Group of America Inc.
+        "volvo", // volvo Volvo Holding Sverige Aktiebolag
         "vote", // vote Monolith Registry LLC
         "voting", // voting Valuetainment Corp.
         "voto", // voto Monolith Registry LLC
@@ -1376,6 +1390,7 @@ public final class DomainValidator extends AbstractValidator {
         "work", // work Top Level Domain Holdings Limited
         "works", // works Little Dynamite, LLC
         "world", // world Bitter Fields, LLC
+        "wow", // wow Amazon Registry Services, Inc.
         "wtc", // wtc World Trade Centers Association, Inc.
         "wtf", // wtf Hidden Way, LLC
         "xbox", // xbox Microsoft Corporation
@@ -1394,6 +1409,7 @@ public final class DomainValidator extends AbstractValidator {
         "xn--42c2d9a", // คอม VeriSign Sarl
         "xn--45q11c", // 八卦 Zodiac Scorpio Limited
         "xn--4gbrim", // موقع Suhub Electronic Establishment
+        "xn--54b7fta0cc", // বাংলা Posts and Telecommunications Division
         "xn--55qw42g", // 公益 China Organizational Name Administration Center
         "xn--55qx5d", // 公司 Computer Network Information Center of Chinese Academy of Sciences (China Internet Network Information Center)
         "xn--5su34j936bgsg", // 香格里拉 Shangri‐La International Hotel Management Limited
@@ -1430,6 +1446,7 @@ public final class DomainValidator extends AbstractValidator {
         "xn--fzys8d69uvgm", // 電訊盈科 PCCW Enterprises Limited
         "xn--g2xx48c", // 购物 Minds + Machines Group Limited
         "xn--gckr3f0f", // クラウド Amazon Registry Services, Inc.
+        "xn--gk3at1e", // 通販 Amazon Registry Services, Inc.
         "xn--hxt814e", // 网店 Zodiac Libra Limited
         "xn--i1b6b1a6a2e", // संगठन Public Interest Registry
         "xn--imr513n", // 餐厅 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
index decf61d..64c7611 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
@@ -6,7 +6,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -50,27 +49,6 @@ public class Addresses extends Test {
     protected static final String ASSOCIATED_STREET  = "associatedStreet";
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
-    protected static class AddressError extends TestError {
-
-        public AddressError(Addresses tester, int code, OsmPrimitive p, String message) {
-            this(tester, code, Collections.singleton(p), message);
-        }
-
-        public AddressError(Addresses tester, int code, Collection<OsmPrimitive> collection, String message) {
-            this(tester, code, collection, message, null, null);
-        }
-
-        public AddressError(Addresses tester, int code, Collection<OsmPrimitive> collection, String message,
-                String description, String englishDescription) {
-            this(tester, code, Severity.WARNING, collection, message, description, englishDescription);
-        }
-
-        public AddressError(Addresses tester, int code, Severity severity, Collection<OsmPrimitive> collection, String message,
-                String description, String englishDescription) {
-            super(tester, severity, message, description, englishDescription, code, collection);
-        }
-    }
-
     /**
      * Constructor
      */
@@ -97,8 +75,10 @@ public class Addresses extends Test {
             }
             List<OsmPrimitive> errorList = new ArrayList<>(list);
             errorList.add(0, p);
-            errors.add(new AddressError(this, MULTIPLE_STREET_RELATIONS, level, errorList,
-                    tr("Multiple associatedStreet relations"), null, null));
+            errors.add(TestError.builder(this, level, MULTIPLE_STREET_RELATIONS)
+                    .message(tr("Multiple associatedStreet relations"))
+                    .primitives(errorList)
+                    .build());
         }
         return list;
     }
@@ -118,7 +98,10 @@ public class Addresses extends Test {
                 }
             }
             // No street found
-            errors.add(new AddressError(this, HOUSE_NUMBER_WITHOUT_STREET, p, tr("House number without street")));
+            errors.add(TestError.builder(this, Severity.WARNING, HOUSE_NUMBER_WITHOUT_STREET)
+                    .message(tr("House number without street"))
+                    .primitives(p)
+                    .build());
         }
     }
 
@@ -178,18 +161,21 @@ public class Addresses extends Test {
                 }
             }
             // Report duplicate house numbers
-            String englishDescription = marktr("House number ''{0}'' duplicated");
             for (Entry<String, List<OsmPrimitive>> entry : map.entrySet()) {
                 List<OsmPrimitive> list = entry.getValue();
                 if (list.size() > 1) {
-                    errors.add(new AddressError(this, DUPLICATE_HOUSE_NUMBER, list,
-                            tr("Duplicate house numbers"), tr(englishDescription, entry.getKey()), englishDescription));
+                    errors.add(TestError.builder(this, Severity.WARNING, DUPLICATE_HOUSE_NUMBER)
+                            .message(tr("Duplicate house numbers"), marktr("House number ''{0}'' duplicated"), entry.getKey())
+                            .primitives(list)
+                            .build());
                 }
             }
             // Report wrong street names
             if (!wrongStreetNames.isEmpty()) {
-                errors.add(new AddressError(this, MULTIPLE_STREET_NAMES, wrongStreetNames,
-                        tr("Multiple street names in relation")));
+                errors.add(TestError.builder(this, Severity.WARNING, MULTIPLE_STREET_NAMES)
+                        .message(tr("Multiple street names in relation"))
+                        .primitives(wrongStreetNames)
+                        .build());
             }
             // Report addresses too far away
             if (!street.isEmpty()) {
@@ -244,7 +230,9 @@ public class Addresses extends Test {
         if (hasIncompleteWays) return;
         List<OsmPrimitive> errorList = new ArrayList<>(street);
         errorList.add(0, house);
-        errors.add(new AddressError(this, HOUSE_NUMBER_TOO_FAR, errorList,
-                tr("House number too far from street")));
+        errors.add(TestError.builder(this, Severity.WARNING, HOUSE_NUMBER_TOO_FAR)
+                .message(tr("House number too far from street"))
+                .primitives(errorList)
+                .build());
     }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/ApiCapabilitiesTest.java b/src/org/openstreetmap/josm/data/validation/tests/ApiCapabilitiesTest.java
index a99c0ee..d7f324d 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/ApiCapabilitiesTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/ApiCapabilitiesTest.java
@@ -49,7 +49,10 @@ public class ApiCapabilitiesTest extends Test {
             } else {
                 message = tr("Way contains more than {0} nodes. It should be split or simplified", maxNodes);
             }
-            errors.add(new TestError(this, Severity.ERROR, message, MAX_WAY_NODES_ERROR, w));
+            errors.add(TestError.builder(this, Severity.ERROR, MAX_WAY_NODES_ERROR)
+                    .message(message)
+                    .primitives(w)
+                    .build());
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/BarriersEntrances.java b/src/org/openstreetmap/josm/data/validation/tests/BarriersEntrances.java
index 3ebc8fa..4425330 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/BarriersEntrances.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/BarriersEntrances.java
@@ -32,7 +32,11 @@ public class BarriersEntrances extends Test {
                     return;
                 }
             }
-            errors.add(new TestError(this, Severity.WARNING, tr("Barrier entrance not set on a barrier"), BARRIER_ENTRANCE_WITHOUT_BARRIER, n));
+            errors.add(TestError
+                    .builder(this, Severity.WARNING, BARRIER_ENTRANCE_WITHOUT_BARRIER)
+                    .message(tr("Barrier entrance not set on a barrier"))
+                    .primitives(n)
+                    .build());
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java b/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java
index 4089a5d..ba4c179 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java
@@ -7,11 +7,12 @@ import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
@@ -20,24 +21,24 @@ import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Geometry;
 
 /**
  * Check coastlines for errors
  *
  * @author frsantos
  * @author Teemu Koskinen
+ * @author Gerd Petermann
  */
 public class Coastlines extends Test {
 
     protected static final int UNORDERED_COASTLINE = 901;
     protected static final int REVERSED_COASTLINE = 902;
     protected static final int UNCONNECTED_COASTLINE = 903;
+    protected static final int WRONG_ORDER_COASTLINE = 904;
 
-    private List<Way> coastlines;
-
-    private Area downloadedArea;
+    private List<Way> coastlineWays;
 
     /**
      * Constructor
@@ -48,155 +49,194 @@ public class Coastlines extends Test {
 
     @Override
     public void startTest(ProgressMonitor monitor) {
-
         super.startTest(monitor);
-
-        OsmDataLayer layer = Main.getLayerManager().getEditLayer();
-
-        if (layer != null) {
-            downloadedArea = layer.data.getDataSourceArea();
-        }
-
-        coastlines = new LinkedList<>();
+        coastlineWays = new LinkedList<>();
     }
 
     @Override
     public void endTest() {
-        for (Way c1 : coastlines) {
-            Node head = c1.firstNode();
-            Node tail = c1.lastNode();
+        checkConnections();
+        checkDirection();
+        coastlineWays = null;
+        super.endTest();
+    }
 
-            if (c1.getNodesCount() == 0 || head.equals(tail)) {
-                continue;
+    /**
+     * Check connections between coastline ways.
+     * The nodes of a coastline way have to fullfil these rules:
+     * 1) the first node must be connected to the last node of a coastline way (which might be the same way)
+     * 2) the last node must be connected to the first node of a coastline way (which might be the same way)
+     * 3) all other nodes must not be connected to a coastline way
+     * 4) the number of referencing coastline ways must be 1 or 2
+     * Nodes outside the download area are special cases, we may not know enough about the connected ways.
+     */
+    private void checkConnections() {
+        Area downloadedArea = null;
+        for (Way w : coastlineWays) {
+            if (downloadedArea == null) {
+                downloadedArea = w.getDataSet().getDataSourceArea();
             }
-
-            int headWays = 0;
-            int tailWays = 0;
-            boolean headReversed = false;
-            boolean tailReversed = false;
-            boolean headUnordered = false;
-            boolean tailUnordered = false;
-            Way next = null;
-            Way prev = null;
-
-            for (Way c2 : coastlines) {
-                if (c1 == c2) {
-                    continue;
-                }
-
-                if (c2.containsNode(head)) {
-                    headWays++;
-                    next = c2;
-
-                    if (head.equals(c2.firstNode())) {
-                        headReversed = true;
-                    } else if (!head.equals(c2.lastNode())) {
-                        headUnordered = true;
+            int numNodes = w.getNodesCount();
+            for (int i = 0; i < numNodes; i++) {
+                Node n = w.getNode(i);
+                List<OsmPrimitive> refs = n.getReferrers();
+                Set<Way> connectedWays = new HashSet<>();
+                for (OsmPrimitive p : refs) {
+                    if (p != w && isCoastline(p)) {
+                        connectedWays.add((Way) p);
                     }
                 }
-
-                if (c2.containsNode(tail)) {
-                    tailWays++;
-                    prev = c2;
-
-                    if (tail.equals(c2.lastNode())) {
-                        tailReversed = true;
-                    } else if (!tail.equals(c2.firstNode())) {
-                        tailUnordered = true;
+                if (i == 0) {
+                    if (connectedWays.isEmpty() && n != w.lastNode() && n.getCoor().isIn(downloadedArea)) {
+                        addError(UNCONNECTED_COASTLINE, w, null, n);
                     }
-                }
-            }
-
-            // To avoid false positives on upload (only modified primitives
-            // are visited), we have to check possible connection to ways
-            // that are not in the set of validated primitives.
-            if (headWays == 0) {
-                Collection<OsmPrimitive> refs = head.getReferrers();
-                for (OsmPrimitive ref : refs) {
-                    if (ref != c1 && isCoastline(ref)) {
-                        // ref cannot be in <code>coastlines</code>, otherwise we would
-                        // have picked it up already
-                        headWays++;
-                        next = (Way) ref;
-
-                        if (head.equals(next.firstNode())) {
-                            headReversed = true;
-                        } else if (!head.equals(next.lastNode())) {
-                            headUnordered = true;
-                        }
+                    if (connectedWays.size() == 1 && n != connectedWays.iterator().next().lastNode()) {
+                        checkIfReversed(w, connectedWays.iterator().next(), n);
                     }
-                }
-            }
-            if (tailWays == 0) {
-                Collection<OsmPrimitive> refs = tail.getReferrers();
-                for (OsmPrimitive ref : refs) {
-                    if (ref != c1 && isCoastline(ref)) {
-                        tailWays++;
-                        prev = (Way) ref;
-
-                        if (tail.equals(prev.lastNode())) {
-                            tailReversed = true;
-                        } else if (!tail.equals(prev.firstNode())) {
-                            tailUnordered = true;
-                        }
+                    if (connectedWays.size() == 1 && w.isClosed() && connectedWays.iterator().next().isClosed()) {
+                        addError(UNORDERED_COASTLINE, w, connectedWays, n);
+                    }
+                } else if (i == numNodes - 1) {
+                    if (connectedWays.isEmpty() && n != w.firstNode() && n.getCoor().isIn(downloadedArea)) {
+                        addError(UNCONNECTED_COASTLINE, w, null, n);
+                    }
+                    if (connectedWays.size() == 1 && n != connectedWays.iterator().next().firstNode()) {
+                        checkIfReversed(w, connectedWays.iterator().next(), n);
                     }
+                } else if (!connectedWays.isEmpty()) {
+                    addError(UNORDERED_COASTLINE, w, connectedWays, n);
                 }
             }
+        }
+    }
 
-            List<OsmPrimitive> primitives = new ArrayList<>();
-            primitives.add(c1);
-
-            if (headWays == 0 || tailWays == 0) {
-                List<OsmPrimitive> highlight = new ArrayList<>();
-
-                if (headWays == 0 && head.getCoor().isIn(downloadedArea)) {
-                    highlight.add(head);
-                }
-                if (tailWays == 0 && tail.getCoor().isIn(downloadedArea)) {
-                    highlight.add(tail);
-                }
-
-                if (!highlight.isEmpty()) {
-                    errors.add(new TestError(this, Severity.ERROR, tr("Unconnected coastline"),
-                            UNCONNECTED_COASTLINE, primitives, highlight));
+    /**
+     * Check if two or more coastline ways form a closed clockwise way
+     */
+    private void checkDirection() {
+        HashSet<Way> done = new HashSet<>();
+        for (Way w : coastlineWays) {
+            if (done.contains(w))
+                continue;
+            List<Way> visited = new ArrayList<>();
+            done.add(w);
+            visited.add(w);
+            List<Node> nodes = new ArrayList<>(w.getNodes());
+            Way curr = w;
+            while (nodes.get(0) != nodes.get(nodes.size()-1)) {
+                boolean foundContinuation = false;
+                for (OsmPrimitive p : curr.lastNode().getReferrers()) {
+                    if (p != curr && isCoastline(p)) {
+                        Way other = (Way) p;
+                        if (done.contains(other))
+                            continue;
+                        if (other.firstNode() == curr.lastNode()) {
+                            foundContinuation = true;
+                            curr = other;
+                            done.add(curr);
+                            visited.add(curr);
+                            nodes.remove(nodes.size()-1); // remove duplicate connection node
+                            nodes.addAll(curr.getNodes());
+                            break;
+                        }
+                    }
                 }
+                if (!foundContinuation)
+                    break;
             }
-
-            boolean unordered = false;
-            boolean reversed = headWays == 1 && headReversed && tailWays == 1 && tailReversed;
-
-            if (headWays > 1 || tailWays > 1) {
-                unordered = true;
-            } else if (headUnordered || tailUnordered) {
-                unordered = true;
-            } else if (reversed && next == prev) {
-                unordered = true;
-            } else if ((headReversed || tailReversed) && headReversed != tailReversed) {
-                unordered = true;
+            // simple closed ways are reported by WronglyOrderedWays
+            if (visited.size() > 1 && nodes.get(0) == nodes.get(nodes.size()-1) && Geometry.isClockwise(nodes)) {
+                errors.add(TestError.builder(this, Severity.WARNING, WRONG_ORDER_COASTLINE)
+                        .message(tr("Reversed coastline: land not on left side"))
+                        .primitives(visited)
+                        .build());
             }
+        }
+    }
 
-            if (unordered) {
-                List<OsmPrimitive> highlight = new ArrayList<>();
-
-                if (headWays > 1 || headUnordered || headReversed || reversed) {
-                    highlight.add(head);
-                }
-                if (tailWays > 1 || tailUnordered || tailReversed || reversed) {
-                    highlight.add(tail);
+    /**
+     * Check if a reversed way would fit, if yes, add fixable "reversed" error, "unordered" else
+     * @param w way that might be reversed
+     * @param other other way that is connected to w
+     * @param n1 node at which w and other are connected
+     */
+    private void checkIfReversed(Way w, Way other, Node n1) {
+        boolean headFixedWithReverse = false;
+        boolean tailFixedWithReverse = false;
+        int otherCoastlineWays = 0;
+        Way connectedToFirst = null;
+        for (int i = 0; i < 2; i++) {
+            Node n = (i == 0) ? w.firstNode() : w.lastNode();
+            List<OsmPrimitive> refs = n.getReferrers();
+            for (OsmPrimitive p : refs) {
+                if (p != w && isCoastline(p)) {
+                    Way cw = (Way) p;
+                    if (i == 0 && cw.firstNode() == n) {
+                        headFixedWithReverse = true;
+                        connectedToFirst = cw;
+                    } else if (i == 1 && cw.lastNode() == n) {
+                        if (cw != connectedToFirst)
+                            tailFixedWithReverse = true;
+                    } else
+                        otherCoastlineWays++;
                 }
-
-                errors.add(new TestError(this, Severity.ERROR, tr("Unordered coastline"),
-                        UNORDERED_COASTLINE, primitives, highlight));
-            } else if (reversed) {
-                errors.add(new TestError(this, Severity.ERROR, tr("Reversed coastline"),
-                        REVERSED_COASTLINE, primitives));
             }
         }
+        if (otherCoastlineWays == 0 && headFixedWithReverse && tailFixedWithReverse)
+            addError(REVERSED_COASTLINE, w, null, null);
+        else
+            addError(UNORDERED_COASTLINE, w, Collections.singletonList(other), n1);
+    }
 
-        coastlines = null;
-        downloadedArea = null;
-
-        super.endTest();
+    /**
+     * Add error if not already done
+     * @param errCode the error code
+     * @param w the way that is in error
+     * @param otherWays collection of other ways in error or null
+     * @param n the node to be highlighted or null
+     */
+    private void addError(int errCode, Way w, Collection<Way> otherWays, Node n) {
+        String msg;
+        switch (errCode) {
+        case UNCONNECTED_COASTLINE:
+            msg = tr("Unconnected coastline");
+            break;
+        case UNORDERED_COASTLINE:
+            msg = tr("Unordered coastline");
+            break;
+        case REVERSED_COASTLINE:
+            msg = tr("Reversed coastline");
+            break;
+        default:
+            msg = tr("invalid coastline"); // should not happen
+        }
+        Set<OsmPrimitive> primitives = new HashSet<>();
+        primitives.add(w);
+        if (otherWays != null)
+            primitives.addAll(otherWays);
+        // check for repeated error
+        for (TestError e : errors) {
+            if (e.getCode() != errCode)
+                continue;
+            if (errCode != REVERSED_COASTLINE && !e.getHighlighted().contains(n))
+                continue;
+            if (e.getPrimitives().size() != primitives.size())
+                continue;
+            if (!e.getPrimitives().containsAll(primitives))
+                continue;
+            return; // we already know this error
+        }
+        if (errCode != REVERSED_COASTLINE)
+            errors.add(TestError.builder(this, Severity.ERROR, errCode)
+                    .message(msg)
+                    .primitives(primitives)
+                    .highlight(n)
+                    .build());
+        else
+            errors.add(TestError.builder(this, Severity.ERROR, errCode)
+                    .message(msg)
+                    .primitives(primitives)
+                    .build());
     }
 
     @Override
@@ -205,7 +245,7 @@ public class Coastlines extends Test {
             return;
 
         if (isCoastline(way)) {
-            coastlines.add(way);
+            coastlineWays.add(way);
         }
     }
 
diff --git a/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java b/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
index 525457e..5382f60 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
@@ -166,13 +166,19 @@ public class ConditionalKeys extends Test.TagTest {
         for (final String key : SubclassFilteredCollection.filter(p.keySet(),
                 Pattern.compile(":conditional(:.*)?$").asPredicate())) {
             if (!isKeyValid(key)) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Wrong syntax in {0} key", key), 3201, p));
+                errors.add(TestError.builder(this, Severity.WARNING, 3201)
+                        .message(tr("Wrong syntax in {0} key", key))
+                        .primitives(p)
+                        .build());
                 continue;
             }
             final String value = p.get(key);
             final String error = validateValue(key, value);
             if (error != null) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Error in {0} value: {1}", key, error), 3202, p));
+                errors.add(TestError.builder(this, Severity.WARNING, 3202)
+                        .message(tr("Error in {0} value: {1}", key, error))
+                        .primitives(p)
+                        .build());
             }
         }
         return errors;
diff --git a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
index 6006b7b..ed30e7a 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -59,20 +58,22 @@ public abstract class CrossingWays extends Test {
                     && !isProposedOrAbandoned(w)
                     && ((w.hasKey(HIGHWAY) && !w.hasTag(HIGHWAY, "rest_area", "services"))
                     || w.hasKey(WATERWAY)
-                    || (w.hasKey(RAILWAY) && !isSubwayOrTram(w))
+                    || (w.hasKey(RAILWAY) && !isSubwayOrTramOrRazed(w))
                     || isCoastline(w)
                     || isBuilding(w));
         }
 
         @Override
         boolean ignoreWaySegmentCombination(Way w1, Way w2) {
+            if (w1 == w2)
+                return false;
             if (!Objects.equals(getLayer(w1), getLayer(w2))) {
                 return true;
             }
             if (w1.hasKey(HIGHWAY) && w2.hasKey(HIGHWAY) && !Objects.equals(w1.get("level"), w2.get("level"))) {
                 return true;
             }
-            if (isSubwayOrTram(w2)) {
+            if (isSubwayOrTramOrRazed(w2)) {
                 return true;
             }
             if (isCoastline(w1) != isCoastline(w2)) {
@@ -171,6 +172,38 @@ public abstract class CrossingWays extends Test {
     }
 
     /**
+     * Self crossing ways test (for all the rest)
+     */
+    public static class SelfCrossing extends CrossingWays {
+        CrossingWays.Ways normalTest = new Ways();
+        CrossingWays.Barrier barrierTest = new Barrier();
+        CrossingWays.Boundaries boundariesTest = new Boundaries();
+
+        /**
+         * Constructs a new SelfIntersection test.
+         */
+        public SelfCrossing() {
+            super(tr("Self crossing"));
+        }
+
+        @Override
+        public boolean isPrimitiveUsable(OsmPrimitive p) {
+            return super.isPrimitiveUsable(p) && !(normalTest.isPrimitiveUsable(p) || barrierTest.isPrimitiveUsable(p)
+                    || boundariesTest.isPrimitiveUsable(p));
+        }
+
+        @Override
+        boolean ignoreWaySegmentCombination(Way w1, Way w2) {
+            return w1 != w2; // should not happen
+        }
+
+        @Override
+        String createMessage(Way w1, Way w2) {
+            return tr("Self-crossing ways");
+        }
+    }
+
+    /**
      * Constructs a new {@code CrossingWays} test.
      * @param title The test title
      * @since 6691
@@ -206,8 +239,8 @@ public abstract class CrossingWays extends Test {
         return w.hasTag("natural", "water", "coastline") || w.hasTag("landuse", "reservoir");
     }
 
-    static boolean isSubwayOrTram(OsmPrimitive w) {
-        return w.hasTag(RAILWAY, "subway", "tram");
+    static boolean isSubwayOrTramOrRazed(OsmPrimitive w) {
+        return w.hasTag(RAILWAY, "subway", "tram", "razed");
     }
 
     static boolean isProposedOrAbandoned(OsmPrimitive w) {
@@ -220,6 +253,11 @@ public abstract class CrossingWays extends Test {
 
     @Override
     public void visit(Way w) {
+        if (this instanceof SelfCrossing) {
+            // free memory, we are not interested in previous ways
+            cellSegments.clear();
+            seenWays.clear();
+        }
 
         int nodesSize = w.getNodesCount();
         for (int i = 0; i < nodesSize - 1; i++) {
@@ -230,7 +268,7 @@ public abstract class CrossingWays extends Test {
                 Main.warn("Crossing ways test skipped "+es1);
                 continue;
             }
-            for (List<WaySegment> segments : getSegments(en1, en2)) {
+            for (List<WaySegment> segments : getSegments(cellSegments, en1, en2)) {
                 for (WaySegment es2 : segments) {
                     List<Way> prims;
                     List<WaySegment> highlight;
@@ -239,18 +277,21 @@ public abstract class CrossingWays extends Test {
                         continue;
                     }
 
-                    prims = Arrays.asList(es1.way, es2.way);
+                    prims = new ArrayList<>();
+                    prims.add(es1.way);
+                    if (es1.way != es2.way)
+                        prims.add(es2.way);
                     if ((highlight = seenWays.get(prims)) == null) {
                         highlight = new ArrayList<>();
                         highlight.add(es1);
                         highlight.add(es2);
 
                         final String message = createMessage(es1.way, es2.way);
-                        errors.add(new TestError(this, Severity.WARNING,
-                                message,
-                                CROSSING_WAYS,
-                                prims,
-                                highlight));
+                        errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS)
+                                .message(message)
+                                .primitives(prims)
+                                .highlightWaySegments(highlight)
+                                .build());
                         seenWays.put(prims, highlight);
                     } else {
                         highlight.add(es1);
@@ -265,12 +306,12 @@ public abstract class CrossingWays extends Test {
     /**
      * Returns all the cells this segment crosses.  Each cell contains the list
      * of segments already processed
-     *
+     * @param cellSegments map with already collected way segments
      * @param n1 The first EastNorth
      * @param n2 The second EastNorth
      * @return A list with all the cells the segment crosses
      */
-    private List<List<WaySegment>> getSegments(EastNorth n1, EastNorth n2) {
+    public static List<List<WaySegment>> getSegments(Map<Point2D, List<WaySegment>> cellSegments, EastNorth n1, EastNorth n2) {
 
         List<List<WaySegment>> cells = new ArrayList<>();
         for (Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.griddetail)) {
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
index d881ac5..ef0add1 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
@@ -172,14 +172,14 @@ public class DuplicateNode extends Test {
 
         // check whether we have multiple nodes at the same position with the same tag set
         for (Iterator<Map<String, String>> it = mm.keySet().iterator(); it.hasNext();) {
-            Map<String, String> tagSet = it.next();
-            if (mm.get(tagSet).size() > 1) {
+            Set<OsmPrimitive> primitives = mm.get(it.next());
+            if (primitives.size() > 1) {
 
                 for (String type: TYPES) {
                     typeMap.put(type, Boolean.FALSE);
                 }
 
-                for (OsmPrimitive p : mm.get(tagSet)) {
+                for (OsmPrimitive p : primitives) {
                     if (p.getType() == OsmPrimitiveType.NODE) {
                         Node n = (Node) p;
                         List<OsmPrimitive> lp = n.getReferrers();
@@ -202,145 +202,74 @@ public class DuplicateNode extends Test {
                     }
                 }
 
-                int nbType = 0;
-                for (Entry<String, Boolean> entry: typeMap.entrySet()) {
-                    if (entry.getValue()) {
-                        nbType++;
-                    }
-                }
+                long nbType = typeMap.entrySet().stream().filter(Entry::getValue).count();
 
                 if (nbType > 1) {
-                    String msg = marktr("Mixed type duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.WARNING,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_MIXED,
-                            mm.get(tagSet)
-                            ));
+                    errors.add(TestError.builder(parentTest, Severity.WARNING, DUPLICATE_NODE_MIXED)
+                            .message(marktr("Mixed type duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 } else if (typeMap.get("highway")) {
-                    String msg = marktr("Highway duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.ERROR,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_HIGHWAY,
-                            mm.get(tagSet)
-                            ));
+                    errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_HIGHWAY)
+                            .message(marktr("Highway duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 } else if (typeMap.get("railway")) {
-                    String msg = marktr("Railway duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.ERROR,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_RAILWAY,
-                            mm.get(tagSet)
-                            ));
+                    errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_RAILWAY)
+                            .message(marktr("Railway duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 } else if (typeMap.get("waterway")) {
-                    String msg = marktr("Waterway duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.ERROR,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_WATERWAY,
-                            mm.get(tagSet)
-                            ));
+                    errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_WATERWAY)
+                            .message(marktr("Waterway duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 } else if (typeMap.get("boundary")) {
-                    String msg = marktr("Boundary duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.ERROR,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_BOUNDARY,
-                            mm.get(tagSet)
-                            ));
+                    errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_BOUNDARY)
+                            .message(marktr("Boundary duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 } else if (typeMap.get("power")) {
-                    String msg = marktr("Power duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.ERROR,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_POWER,
-                            mm.get(tagSet)
-                            ));
+                    errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_POWER)
+                            .message(marktr("Power duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 } else if (typeMap.get("natural")) {
-                    String msg = marktr("Natural duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.ERROR,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_NATURAL,
-                            mm.get(tagSet)
-                            ));
+                    errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_NATURAL)
+                            .message(marktr("Natural duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 } else if (typeMap.get("building")) {
-                    String msg = marktr("Building duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.ERROR,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_BUILDING,
-                            mm.get(tagSet)
-                            ));
+                    errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_BUILDING)
+                            .message(marktr("Building duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 } else if (typeMap.get("landuse")) {
-                    String msg = marktr("Landuse duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.ERROR,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_LANDUSE,
-                            mm.get(tagSet)
-                            ));
+                    errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_LANDUSE)
+                            .message(marktr("Landuse duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 } else {
-                    String msg = marktr("Other duplicated nodes");
-                    errors.add(new TestError(
-                            parentTest,
-                            Severity.WARNING,
-                            tr("Duplicated nodes"),
-                            tr(msg),
-                            msg,
-                            DUPLICATE_NODE_OTHER,
-                            mm.get(tagSet)
-                            ));
-
+                    errors.add(TestError.builder(parentTest, Severity.WARNING, DUPLICATE_NODE_OTHER)
+                            .message(marktr("Other duplicated nodes"))
+                            .primitives(primitives)
+                            .build());
                 }
                 it.remove();
             }
         }
 
-        // check whether we have multiple nodes at the same position with
-        // differing tag sets
-        //
+        // check whether we have multiple nodes at the same position with differing tag sets
         if (!mm.isEmpty()) {
             List<OsmPrimitive> duplicates = new ArrayList<>();
             for (Set<OsmPrimitive> l: mm.values()) {
                 duplicates.addAll(l);
             }
             if (duplicates.size() > 1) {
-                errors.add(new TestError(
-                        parentTest,
-                        Severity.WARNING,
-                        tr("Nodes at same position"),
-                        DUPLICATE_NODE,
-                        duplicates
-                        ));
+                errors.add(TestError.builder(parentTest, Severity.WARNING, DUPLICATE_NODE)
+                        .message(tr("Nodes at same position"))
+                        .primitives(duplicates)
+                        .build());
             }
         }
         return errors;
@@ -406,7 +335,7 @@ public class DuplicateNode extends Test {
                 target = nodes.iterator().next();
             }
 
-            if (Command.checkOutlyingOrIncompleteOperation("delete", nodes, Collections.singleton(target)) == Command.IS_OK)
+            if (Command.checkOutlyingOrIncompleteOperation(nodes, Collections.singleton(target)) == Command.IS_OK)
                 return MergeNodesAction.mergeNodes(Main.getLayerManager().getEditLayer(), nodes, target);
         }
 
@@ -419,7 +348,8 @@ public class DuplicateNode extends Test {
         // never merge nodes with different tags.
         if (testError.getCode() == DUPLICATE_NODE) return false;
         // cannot merge nodes outside download area
-        if (testError.getPrimitives().iterator().next().isOutsideDownloadArea()) return false;
+        final Iterator<? extends OsmPrimitive> it = testError.getPrimitives().iterator();
+        if (!it.hasNext() || it.next().isOutsideDownloadArea()) return false;
         // everything else is ok to merge
         return true;
     }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
index 4fdcb2c..7bd1eee 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
@@ -202,14 +202,20 @@ public class DuplicateRelation extends Test {
         super.endTest();
         for (Set<OsmPrimitive> duplicated : relations.values()) {
             if (duplicated.size() > 1) {
-                TestError testError = new TestError(this, Severity.ERROR, tr("Duplicated relations"), DUPLICATE_RELATION, duplicated);
+                TestError testError = TestError.builder(this, Severity.ERROR, DUPLICATE_RELATION)
+                        .message(tr("Duplicated relations"))
+                        .primitives(duplicated)
+                        .build();
                 errors.add(testError);
             }
         }
         relations = null;
         for (Set<OsmPrimitive> duplicated : relationsNoKeys.values()) {
             if (duplicated.size() > 1) {
-                TestError testError = new TestError(this, Severity.WARNING, tr("Relations with same members"), SAME_RELATION, duplicated);
+                TestError testError = TestError.builder(this, Severity.WARNING, SAME_RELATION)
+                        .message(tr("Relations with same members"))
+                        .primitives(duplicated)
+                        .build();
                 errors.add(testError);
             }
         }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
index 47d99b3..71567a0 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
@@ -122,7 +122,10 @@ public class DuplicateWay extends Test {
         super.endTest();
         for (Set<OsmPrimitive> duplicated : ways.values()) {
             if (duplicated.size() > 1) {
-                TestError testError = new TestError(this, Severity.ERROR, tr("Duplicated ways"), DUPLICATE_WAY, duplicated);
+                TestError testError = TestError.builder(this, Severity.ERROR, DUPLICATE_WAY)
+                        .message(tr("Duplicated ways"))
+                        .primitives(duplicated)
+                        .build();
                 errors.add(testError);
             }
         }
@@ -149,7 +152,10 @@ public class DuplicateWay extends Test {
                 if (skip) {
                     continue;
                 }
-                TestError testError = new TestError(this, Severity.WARNING, tr("Ways with same position"), SAME_WAY, sameway);
+                TestError testError = TestError.builder(this, Severity.WARNING, SAME_WAY)
+                        .message(tr("Ways with same position"))
+                        .primitives(sameway)
+                        .build();
                 errors.add(testError);
             }
         }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java
index 6ed6b81..0dea04a 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.data.validation.tests;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 
@@ -42,8 +41,11 @@ public class DuplicatedWayNodes extends Test {
                 continue;
             }
             if (lastN == n) {
-                errors.add(new TestError(this, Severity.ERROR, tr("Duplicated way nodes"), DUPLICATE_WAY_NODE,
-                        Arrays.asList(w), Arrays.asList(n)));
+                errors.add(TestError.builder(this, Severity.ERROR, DUPLICATE_WAY_NODE)
+                        .message(tr("Duplicated way nodes"))
+                        .primitives(w)
+                        .highlight(n)
+                        .build());
                 break;
             }
             lastN = n;
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Highways.java b/src/org/openstreetmap/josm/data/validation/tests/Highways.java
index 7393cdd..1c66427 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Highways.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Highways.java
@@ -7,19 +7,16 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
 import org.openstreetmap.josm.command.ChangePropertyCommand;
-import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.validation.FixableTestError;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -75,18 +72,6 @@ public class Highways extends Test {
         super(tr("Highways"), tr("Performs semantic checks on highways."));
     }
 
-    protected static class WrongRoundaboutHighway extends TestError {
-
-        public final String correctValue;
-
-        public WrongRoundaboutHighway(Highways tester, Way w, String key) {
-            super(tester, Severity.WARNING,
-                    tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), key),
-                    WRONG_ROUNDABOUT_HIGHWAY, w);
-            this.correctValue = key;
-        }
-    }
-
     @Override
     public void visit(Node n) {
         if (n.isUsable()) {
@@ -146,7 +131,11 @@ public class Highways extends Test {
                 if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
                     // Error when the highway tags do not match
                     if (!w.get("highway").equals(s)) {
-                        errors.add(new WrongRoundaboutHighway(this, w, s));
+                        errors.add(TestError.builder(this, Severity.WARNING, WRONG_ROUNDABOUT_HIGHWAY)
+                                .message(tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), s))
+                                .primitives(w)
+                                .fix(() -> new ChangePropertyCommand(w, "highway", s))
+                                .build());
                     }
                     break;
                 }
@@ -179,8 +168,10 @@ public class Highways extends Test {
 
     private void testHighwayLink(final Way way) {
         if (!isHighwayLinkOkay(way)) {
-            errors.add(new TestError(this, Severity.WARNING,
-                    tr("Highway link is not linked to adequate highway/link"), SOURCE_WRONG_LINK, way));
+            errors.add(TestError.builder(this, Severity.WARNING, SOURCE_WRONG_LINK)
+                    .message(tr("Highway link is not linked to adequate highway/link"))
+                    .primitives(way)
+                    .build());
         }
     }
 
@@ -212,8 +203,10 @@ public class Highways extends Test {
                     handleCarWay(n, w);
                 }
                 if ((leftByPedestrians || leftByCyclists) && leftByCars) {
-                    errors.add(new TestError(this, Severity.OTHER, tr("Missing pedestrian crossing information"),
-                            MISSING_PEDESTRIAN_CROSSING, n));
+                    errors.add(TestError.builder(this, Severity.OTHER, MISSING_PEDESTRIAN_CROSSING)
+                            .message(tr("Missing pedestrian crossing information"))
+                            .primitives(n)
+                            .build());
                     return;
                 }
             }
@@ -248,41 +241,25 @@ public class Highways extends Test {
             // Check country
             String country = value.substring(0, index);
             if (!ISO_COUNTRIES.contains(country)) {
+                final TestError.Builder error = TestError.builder(this, Severity.WARNING, SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE)
+                        .message(tr("Unknown country code: {0}", country))
+                        .primitives(p);
                 if ("UK".equals(country)) {
-                    errors.add(new FixableTestError(this, Severity.WARNING,
-                            tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p,
-                            new ChangePropertyCommand(p, SOURCE_MAXSPEED, value.replace("UK:", "GB:"))));
+                    errors.add(error.fix(() -> new ChangePropertyCommand(p, SOURCE_MAXSPEED, value.replace("UK:", "GB:"))).build());
                 } else {
-                    errors.add(new TestError(this, Severity.WARNING,
-                            tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p));
+                    errors.add(error.build());
                 }
             }
             // Check context
             String context = value.substring(index+1);
             if (!KNOWN_SOURCE_MAXSPEED_CONTEXTS.contains(context)) {
-                errors.add(new TestError(this, Severity.WARNING,
-                        tr("Unknown source:maxspeed context: {0}", context), SOURCE_MAXSPEED_UNKNOWN_CONTEXT, p));
+                errors.add(TestError.builder(this, Severity.WARNING, SOURCE_MAXSPEED_UNKNOWN_CONTEXT)
+                        .message(tr("Unknown source:maxspeed context: {0}", context))
+                        .primitives(p)
+                        .build());
             }
             // TODO: Check coherence of context against maxspeed
             // TODO: Check coherence of context against highway
         }
     }
-
-    @Override
-    public boolean isFixable(TestError testError) {
-        return testError instanceof WrongRoundaboutHighway;
-    }
-
-    @Override
-    public Command fixError(TestError testError) {
-        if (testError instanceof WrongRoundaboutHighway) {
-            // primitives list can be empty if all primitives have been purged
-            Iterator<? extends OsmPrimitive> it = testError.getPrimitives().iterator();
-            if (it.hasNext()) {
-                return new ChangePropertyCommand(it.next(),
-                        "highway", ((WrongRoundaboutHighway) testError).correctValue);
-            }
-        }
-        return null;
-    }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java b/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java
index 5de4192..253e832 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java
@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -101,9 +102,10 @@ public class InternetTags extends Test {
                 String proto = validator instanceof EmailValidator ? "mailto://" : "http://";
                 return doValidateTag(p, k, proto+value, validator, code);
             }
-            String msg = tr("''{0}'': {1}", k, errMsg);
-            // todo obtain English message for ignore functionality
-            error = new TestError(this, Severity.WARNING, validator.getValidatorName(), msg, msg, code, p);
+            error = TestError.builder(this, Severity.WARNING, code)
+                    .message(validator.getValidatorName(), marktr("''{0}'': {1}"), k, errMsg)
+                    .primitives(p)
+                    .build();
         }
         return error;
     }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Lanes.java b/src/org/openstreetmap/josm/data/validation/tests/Lanes.java
index cea0a36..8e5e934 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Lanes.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Lanes.java
@@ -48,12 +48,18 @@ public class Lanes extends Test.TagTest {
 
         if (lanesCount.size() > 1) {
             // if not all numbers are the same
-            errors.add(new TestError(this, Severity.WARNING, message, 3100, p));
+            errors.add(TestError.builder(this, Severity.WARNING, 3100)
+                    .message(message)
+                    .primitives(p)
+                    .build());
         } else if (lanesCount.size() == 1 && p.hasKey(lanesKey)) {
             // ensure that lanes <= *:lanes
             try {
                 if (Integer.parseInt(p.get(lanesKey)) > lanesCount.iterator().next()) {
-                    errors.add(new TestError(this, Severity.WARNING, tr("Number of {0} greater than {1}", lanesKey, "*:" + lanesKey), 3100, p));
+                    errors.add(TestError.builder(this, Severity.WARNING, 3100)
+                            .message(tr("Number of {0} greater than {1}", lanesKey, "*:" + lanesKey))
+                            .primitives(p)
+                            .build());
                 }
             } catch (NumberFormatException ignore) {
                 Main.debug(ignore.getMessage());
@@ -68,8 +74,10 @@ public class Lanes extends Test.TagTest {
         final String backward = Utils.firstNonNull(p.get("lanes:backward"), "0");
         try {
         if (Integer.parseInt(lanes) < Integer.parseInt(forward) + Integer.parseInt(backward)) {
-            errors.add(new TestError(this, Severity.WARNING,
-                    tr("Number of {0} greater than {1}", tr("{0}+{1}", "lanes:forward", "lanes:backward"), "lanes"), 3101, p));
+            errors.add(TestError.builder(this, Severity.WARNING, 3101)
+                    .message(tr("Number of {0} greater than {1}", tr("{0}+{1}", "lanes:forward", "lanes:backward"), "lanes"))
+                    .primitives(p)
+                    .build());
         }
         } catch (NumberFormatException ignore) {
             Main.debug(ignore.getMessage());
diff --git a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
index 7a02915..1fad788 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.openstreetmap.josm.Main;
@@ -39,17 +40,17 @@ public class LongSegment extends Test {
         Double length = w.getLongestSegmentLength();
         if (length > maxlength) {
             length /= 1000.0;
-            errors.add(new TestError(this, Severity.WARNING, tr("Long segments"),
-                    tr("Very long segment of {0} kilometers", length.intValue()),
-                    String.format("Very long segment of %d kilometers", length.intValue()),
-                    LONG_SEGMENT, w));
+            errors.add(TestError.builder(this, Severity.WARNING, LONG_SEGMENT)
+                    .message(tr("Long segments"), marktr("Very long segment of {0} kilometers"), length.intValue())
+                    .primitives(w)
+                    .build());
         }
     }
 
     @Override
     public void startTest(ProgressMonitor monitor) {
         super.startTest(monitor);
-        maxlength = Main.pref.getInteger("validator.maximum.segment.length", 15000);
+        maxlength = Main.pref.getInteger("validator.maximum.segment.length", 15_000);
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
index 5983c8d..22ba028 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests;
 
-import static org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.FixCommand.evaluateObject;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.BufferedReader;
@@ -39,7 +38,6 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.data.validation.FixableTestError;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -139,7 +137,7 @@ public class MapCSSTagChecker extends Test.TagTest {
          * @param matchingSelector  matching selector
          * @return fix command
          */
-        Command createCommand(final OsmPrimitive p, final Selector matchingSelector);
+        Command createCommand(OsmPrimitive p, Selector matchingSelector);
 
         static void checkObject(final Object obj) {
             CheckParameterUtil.ensureThat(obj instanceof Expression || obj instanceof String,
@@ -300,43 +298,46 @@ public class MapCSSTagChecker extends Test.TagTest {
                         check.setClassExpressions.add(ai.key);
                         continue;
                     }
-                    final String val = ai.val instanceof Expression
-                            ? (String) ((Expression) ai.val).evaluate(new Environment())
-                            : ai.val instanceof String
-                            ? (String) ai.val
-                            : ai.val instanceof Keyword
-                            ? ((Keyword) ai.val).val
-                            : null;
-                    if (ai.key.startsWith("throw")) {
-                        try {
-                            final Severity severity = Severity.valueOf(ai.key.substring("throw".length()).toUpperCase(Locale.ENGLISH));
-                            check.errors.put(ai, severity);
-                        } catch (IllegalArgumentException e) {
-                            Main.warn(e, "Unsupported "+ai.key+" instruction. Allowed instructions are "+POSSIBLE_THROWS+'.');
+                    try {
+                        final String val = ai.val instanceof Expression
+                                ? (String) ((Expression) ai.val).evaluate(new Environment())
+                                : ai.val instanceof String
+                                ? (String) ai.val
+                                : ai.val instanceof Keyword
+                                ? ((Keyword) ai.val).val
+                                : null;
+                        if (ai.key.startsWith("throw")) {
+                            try {
+                                check.errors.put(ai, Severity.valueOf(ai.key.substring("throw".length()).toUpperCase(Locale.ENGLISH)));
+                            } catch (IllegalArgumentException e) {
+                                Main.warn(e, "Unsupported "+ai.key+" instruction. Allowed instructions are "+POSSIBLE_THROWS+'.');
+                            }
+                        } else if ("fixAdd".equals(ai.key)) {
+                            check.fixCommands.add(FixCommand.fixAdd(ai.val));
+                        } else if ("fixRemove".equals(ai.key)) {
+                            CheckParameterUtil.ensureThat(!(ai.val instanceof String) || !(val != null && val.contains("=")),
+                                    "Unexpected '='. Please only specify the key to remove!");
+                            check.fixCommands.add(FixCommand.fixRemove(ai.val));
+                        } else if ("fixChangeKey".equals(ai.key) && val != null) {
+                            CheckParameterUtil.ensureThat(val.contains("=>"), "Separate old from new key by '=>'!");
+                            final String[] x = val.split("=>", 2);
+                            check.fixCommands.add(FixCommand.fixChangeKey(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1])));
+                        } else if ("fixDeleteObject".equals(ai.key) && val != null) {
+                            CheckParameterUtil.ensureThat("this".equals(val), "fixDeleteObject must be followed by 'this'");
+                            check.deletion = true;
+                        } else if ("suggestAlternative".equals(ai.key) && val != null) {
+                            check.alternatives.add(val);
+                        } else if ("assertMatch".equals(ai.key) && val != null) {
+                            check.assertions.put(val, Boolean.TRUE);
+                        } else if ("assertNoMatch".equals(ai.key) && val != null) {
+                            check.assertions.put(val, Boolean.FALSE);
+                        } else if ("group".equals(ai.key) && val != null) {
+                            check.group = val;
+                        } else {
+                            throw new IllegalDataException("Cannot add instruction " + ai.key + ": " + ai.val + '!');
                         }
-                    } else if ("fixAdd".equals(ai.key)) {
-                        check.fixCommands.add(FixCommand.fixAdd(ai.val));
-                    } else if ("fixRemove".equals(ai.key)) {
-                        CheckParameterUtil.ensureThat(!(ai.val instanceof String) || !(val != null && val.contains("=")),
-                                "Unexpected '='. Please only specify the key to remove!");
-                        check.fixCommands.add(FixCommand.fixRemove(ai.val));
-                    } else if ("fixChangeKey".equals(ai.key) && val != null) {
-                        CheckParameterUtil.ensureThat(val.contains("=>"), "Separate old from new key by '=>'!");
-                        final String[] x = val.split("=>", 2);
-                        check.fixCommands.add(FixCommand.fixChangeKey(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1])));
-                    } else if ("fixDeleteObject".equals(ai.key) && val != null) {
-                        CheckParameterUtil.ensureThat("this".equals(val), "fixDeleteObject must be followed by 'this'");
-                        check.deletion = true;
-                    } else if ("suggestAlternative".equals(ai.key) && val != null) {
-                        check.alternatives.add(val);
-                    } else if ("assertMatch".equals(ai.key) && val != null) {
-                        check.assertions.put(val, Boolean.TRUE);
-                    } else if ("assertNoMatch".equals(ai.key) && val != null) {
-                        check.assertions.put(val, Boolean.FALSE);
-                    } else if ("group".equals(ai.key) && val != null) {
-                        check.group = val;
-                    } else {
-                        throw new IllegalDataException("Cannot add instruction " + ai.key + ": " + ai.val + '!');
+                    } catch (IllegalArgumentException e) {
+                        throw new IllegalDataException(e);
                     }
                 }
             }
@@ -356,12 +357,9 @@ public class MapCSSTagChecker extends Test.TagTest {
 
             final MapCSSStyleSource source = new MapCSSStyleSource("");
             final MapCSSParser preprocessor = new MapCSSParser(css, MapCSSParser.LexicalState.PREPROCESSOR);
-
-            css = new StringReader(preprocessor.pp_root(source));
-            final MapCSSParser parser = new MapCSSParser(css, MapCSSParser.LexicalState.DEFAULT);
+            final StringReader mapcss = new StringReader(preprocessor.pp_root(source));
+            final MapCSSParser parser = new MapCSSParser(mapcss, MapCSSParser.LexicalState.DEFAULT);
             parser.sheet(source);
-            Collection<Throwable> parseErrors = source.getErrors();
-            assert parseErrors.isEmpty();
             // Ignore "meta" rule(s) from external rules of JOSM wiki
             removeMetaRules(source);
             // group rules with common declaration block
@@ -382,10 +380,10 @@ public class MapCSSTagChecker extends Test.TagTest {
                             new GroupedMapCSSRule(map.getValue(), map.getKey())));
                 } catch (IllegalDataException e) {
                     Main.error("Cannot add MapCss rule: "+e.getMessage());
-                    parseErrors.add(e);
+                    source.logError(e);
                 }
             }
-            return new ParseResult(parseChecks, parseErrors);
+            return new ParseResult(parseChecks, source.getErrors());
         }
 
         private static void removeMetaRules(MapCSSStyleSource source) {
@@ -393,7 +391,7 @@ public class MapCSSTagChecker extends Test.TagTest {
                 MapCSSRule x = it.next();
                 if (x.selector instanceof GeneralSelector) {
                     GeneralSelector gs = (GeneralSelector) x.selector;
-                    if ("meta".equals(gs.base) && gs.getConditions().isEmpty()) {
+                    if ("meta".equals(gs.base)) {
                         it.remove();
                     }
                 }
@@ -567,10 +565,10 @@ public class MapCSSTagChecker extends Test.TagTest {
          */
         TestError getErrorForPrimitive(OsmPrimitive p) {
             final Environment env = new Environment(p);
-            return getErrorForPrimitive(p, whichSelectorMatchesEnvironment(env), env);
+            return getErrorForPrimitive(p, whichSelectorMatchesEnvironment(env), env, null);
         }
 
-        TestError getErrorForPrimitive(OsmPrimitive p, Selector matchingSelector, Environment env) {
+        TestError getErrorForPrimitive(OsmPrimitive p, Selector matchingSelector, Environment env, Test tester) {
             if (matchingSelector != null && !errors.isEmpty()) {
                 final Command fix = fixPrimitive(p);
                 final String description = getDescriptionForMatchingSelector(p, matchingSelector);
@@ -582,11 +580,13 @@ public class MapCSSTagChecker extends Test.TagTest {
                 } else {
                     primitives = Collections.singletonList(p);
                 }
+                final TestError.Builder error = TestError.builder(tester, getSeverity(), 3000)
+                        .messageWithManuallyTranslatedDescription(description1, description2, matchingSelector.toString())
+                        .primitives(primitives);
                 if (fix != null) {
-                    return new FixableTestError(null, getSeverity(), description1, description2, matchingSelector.toString(), 3000,
-                            primitives, fix);
+                    return error.fix(() -> fix).build();
                 } else {
-                    return new TestError(null, getSeverity(), description1, description2, matchingSelector.toString(), 3000, primitives);
+                    return error.build();
                 }
             } else {
                 return null;
@@ -685,9 +685,8 @@ public class MapCSSTagChecker extends Test.TagTest {
                 final Selector selector = check.whichSelectorMatchesEnvironment(env);
                 if (selector != null) {
                     check.rule.declaration.execute(env);
-                    final TestError error = check.getErrorForPrimitive(p, selector, env);
+                    final TestError error = check.getErrorForPrimitive(p, selector, env, new MapCSSTagCheckerAndRule(check.rule));
                     if (error != null) {
-                        error.setTester(new MapCSSTagCheckerAndRule(check.rule));
                         r.add(error);
                     }
                 }
@@ -716,10 +715,10 @@ public class MapCSSTagChecker extends Test.TagTest {
      */
     public synchronized ParseResult addMapCSS(String url) throws ParseException, IOException {
         CheckParameterUtil.ensureParameterNotNull(url, "url");
-        CachedFile cache = new CachedFile(url);
-        InputStream zip = cache.findZipEntryInputStream("validator.mapcss", "");
         ParseResult result;
-        try (InputStream s = zip != null ? zip : cache.getInputStream()) {
+        try (CachedFile cache = new CachedFile(url);
+             InputStream zip = cache.findZipEntryInputStream("validator.mapcss", "");
+             InputStream s = zip != null ? zip : cache.getInputStream()) {
             result = TagCheck.readMapCSS(new BufferedReader(UTFInputStreamReader.create(s)));
             checks.remove(url);
             checks.putAll(url, result.parseChecks);
@@ -729,8 +728,6 @@ public class MapCSSTagChecker extends Test.TagTest {
                     Main.warn(msg);
                 }
             }
-        } finally {
-            cache.close();
         }
         return result;
     }
@@ -751,11 +748,7 @@ public class MapCSSTagChecker extends Test.TagTest {
                 }
                 addMapCSS(i);
                 if (Main.pref.getBoolean("validator.auto_reload_local_rules", true) && source.isLocal()) {
-                    try {
-                        Main.fileWatcher.registerValidatorRule(source);
-                    } catch (IOException e) {
-                        Main.error(e);
-                    }
+                    Main.fileWatcher.registerValidatorRule(source);
                 }
             } catch (IOException ex) {
                 Main.warn(tr("Failed to add {0} to tag checker", i));
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
index de7cf74..19bee23 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
@@ -1,22 +1,25 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.geom.GeneralPath;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.CreateMultipolygonAction;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -25,7 +28,6 @@ import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData.Intersection;
-import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -67,6 +69,10 @@ public class MultipolygonTest extends Test {
     public static final int NO_STYLE_POLYGON = 1611;
     /** Area style on outer way */
     public static final int OUTER_STYLE = 1613;
+    /** Multipolygon member repeated (same primitive, same role */
+    public static final int REPEATED_MEMBER_SAME_ROLE = 1614;
+    /** Multipolygon member repeated (same primitive, different role) */
+    public static final int REPEATED_MEMBER_DIFF_ROLE = 1615;
 
     private static volatile ElemStyles styles;
 
@@ -147,8 +153,11 @@ public class MultipolygonTest extends Test {
                     return;
                 }
             }
-            errors.add(new TestError(this, Severity.WARNING, tr("Area style way is not closed"), NOT_CLOSED,
-                    Collections.singletonList(w), Arrays.asList(nodes.get(0), nodes.get(nodes.size() - 1))));
+            errors.add(TestError.builder(this, Severity.WARNING, NOT_CLOSED)
+                    .message(tr("Area style way is not closed"))
+                    .primitives(w)
+                    .highlight(Arrays.asList(nodes.get(0), nodes.get(nodes.size() - 1)))
+                    .build());
         }
     }
 
@@ -157,10 +166,11 @@ public class MultipolygonTest extends Test {
         if (r.isMultipolygon()) {
             checkMembersAndRoles(r);
             checkOuterWay(r);
+            checkRepeatedWayMembers(r);
 
             // Rest of checks is only for complete multipolygons
             if (!r.hasIncompleteMembers()) {
-                Multipolygon polygon = MultipolygonCache.getInstance().get(Main.map.mapView, r);
+                Multipolygon polygon = new Multipolygon(r);
 
                 // Create new multipolygon using the logics from CreateMultipolygonAction and see if roles match.
                 checkMemberRoleCorrectness(r);
@@ -185,7 +195,10 @@ public class MultipolygonTest extends Test {
             }
         }
         if (!hasOuterWay) {
-            addError(r, new TestError(this, Severity.WARNING, tr("No outer way for multipolygon"), MISSING_OUTER_WAY, r));
+            errors.add(TestError.builder(this, Severity.WARNING, MISSING_OUTER_WAY)
+                    .message(tr("No outer way for multipolygon"))
+                    .primitives(r)
+                    .build());
         }
     }
 
@@ -203,15 +216,13 @@ public class MultipolygonTest extends Test {
                 if (memberInNewMP != null && !memberInNewMP.isEmpty()) {
                     final String roleInNewMP = memberInNewMP.iterator().next().getRole();
                     if (!member.getRole().equals(roleInNewMP)) {
-                        List<OsmPrimitive> l = new ArrayList<>();
-                        l.add(r);
-                        l.add(member.getMember());
-                        addError(r, new TestError(this, Severity.WARNING, RelationChecker.ROLE_VERIF_PROBLEM_MSG,
-                                tr("Role for ''{0}'' should be ''{1}''",
-                                        member.getMember().getDisplayName(DefaultNameFormatter.getInstance()), roleInNewMP),
-                                MessageFormat.format("Role for ''{0}'' should be ''{1}''",
-                                        member.getMember().getDisplayName(DefaultNameFormatter.getInstance()), roleInNewMP),
-                                WRONG_MEMBER_ROLE, l, Collections.singleton(member.getMember())));
+                        errors.add(TestError.builder(this, Severity.WARNING, WRONG_MEMBER_ROLE)
+                                .message(RelationChecker.ROLE_VERIF_PROBLEM_MSG,
+                                        marktr("Role for ''{0}'' should be ''{1}''"),
+                                        member.getMember().getDisplayName(DefaultNameFormatter.getInstance()), roleInNewMP)
+                                .primitives(addRelationIfNeeded(r, member.getMember()))
+                                .highlight(member.getMember())
+                                .build());
                     }
                 }
             }
@@ -241,14 +252,18 @@ public class MultipolygonTest extends Test {
                     }
                 }
                 if (area == null) {
-                    addError(r, new TestError(this, Severity.OTHER, tr("No area style for multipolygon"), NO_STYLE, r));
+                    errors.add(TestError.builder(this, Severity.OTHER, NO_STYLE)
+                            .message(tr("No area style for multipolygon"))
+                            .primitives(r)
+                            .build());
                 } else {
                     /* old style multipolygon - solve: copy tags from outer way to multipolygon */
-                    addError(r, new TestError(this, Severity.WARNING,
-                            trn("Multipolygon relation should be tagged with area tags and not the outer way",
+                    errors.add(TestError.builder(this, Severity.WARNING, NO_STYLE_POLYGON)
+                            .message(trn("Multipolygon relation should be tagged with area tags and not the outer way",
                                     "Multipolygon relation should be tagged with area tags and not the outer ways",
-                                    polygon.getOuterWays().size()),
-                       NO_STYLE_POLYGON, r));
+                                    polygon.getOuterWays().size()))
+                            .primitives(r)
+                            .build());
                 }
             }
 
@@ -257,27 +272,30 @@ public class MultipolygonTest extends Test {
                     AreaElement areaInner = ElemStyles.getAreaElemStyle(wInner, false);
 
                     if (areaInner != null && area.equals(areaInner)) {
-                        List<OsmPrimitive> l = new ArrayList<>();
-                        l.add(r);
-                        l.add(wInner);
-                        addError(r, new TestError(this, Severity.OTHER,
-                                tr("With the currently used mappaint style the style for inner way equals the multipolygon style"),
-                                INNER_STYLE_MISMATCH, l, Collections.singletonList(wInner)));
+                        errors.add(TestError.builder(this, Severity.OTHER, INNER_STYLE_MISMATCH)
+                                .message(tr("With the currently used mappaint style the style for inner way equals the multipolygon style"))
+                                .primitives(addRelationIfNeeded(r, wInner))
+                                .highlight(wInner)
+                                .build());
                     }
                 }
                 for (Way wOuter : polygon.getOuterWays()) {
                     AreaElement areaOuter = ElemStyles.getAreaElemStyle(wOuter, false);
                     if (areaOuter != null) {
-                        List<OsmPrimitive> l = new ArrayList<>();
-                        l.add(r);
-                        l.add(wOuter);
                         if (!area.equals(areaOuter)) {
-                            addError(r, new TestError(this, Severity.OTHER, !areaStyle ? tr("Style for outer way mismatches")
-                            : tr("With the currently used mappaint style(s) the style for outer way mismatches the area style"),
-                            OUTER_STYLE_MISMATCH, l, Collections.singletonList(wOuter)));
+                            String message = !areaStyle ? tr("Style for outer way mismatches")
+                                    : tr("With the currently used mappaint style(s) the style for outer way mismatches the area style");
+                            errors.add(TestError.builder(this, Severity.OTHER, OUTER_STYLE_MISMATCH)
+                                    .message(message)
+                                    .primitives(addRelationIfNeeded(r, wOuter))
+                                    .highlight(wOuter)
+                                    .build());
                         } else if (areaStyle) { /* style on outer way of multipolygon, but equal to polygon */
-                            addError(r, new TestError(this, Severity.WARNING, tr("Area style on outer way"), OUTER_STYLE,
-                            l, Collections.singletonList(wOuter)));
+                            errors.add(TestError.builder(this, Severity.WARNING, OUTER_STYLE)
+                                    .message(tr("Area style on outer way"))
+                                    .primitives(addRelationIfNeeded(r, wOuter))
+                                    .highlight(wOuter)
+                                    .build());
                         }
                     }
                 }
@@ -297,10 +315,11 @@ public class MultipolygonTest extends Test {
     private void checkGeometry(Relation r, Multipolygon polygon) {
         List<Node> openNodes = polygon.getOpenEnds();
         if (!openNodes.isEmpty()) {
-            List<OsmPrimitive> primitives = new LinkedList<>();
-            primitives.add(r);
-            primitives.addAll(openNodes);
-            addError(r, new TestError(this, Severity.WARNING, tr("Multipolygon is not closed"), NON_CLOSED_WAY, primitives, openNodes));
+            errors.add(TestError.builder(this, Severity.WARNING, NON_CLOSED_WAY)
+                    .message(tr("Multipolygon is not closed"))
+                    .primitives(addRelationIfNeeded(r, openNodes))
+                    .highlight(openNodes)
+                    .build());
         }
 
         // For painting is used Polygon class which works with ints only. For validation we need more precision
@@ -327,8 +346,11 @@ public class MultipolygonTest extends Test {
                 outside &= checkCrossingWays(r, outerPolygons, outerPolygonsPaths, pdInner, o) == Intersection.OUTSIDE;
             }
             if (outside) {
-                addError(r, new TestError(this, Severity.WARNING, tr("Multipolygon inner way is outside"),
-                        INNER_WAY_OUTSIDE, Collections.singletonList(r), Arrays.asList(pdInner.getNodes())));
+                errors.add(TestError.builder(this, Severity.WARNING, INNER_WAY_OUTSIDE)
+                        .message(tr("Multipolygon inner way is outside"))
+                        .primitives(r)
+                        .highlightNodePairs(Collections.singletonList(pdInner.getNodes()))
+                        .build());
             }
         }
     }
@@ -338,8 +360,11 @@ public class MultipolygonTest extends Test {
         if (intersection == Intersection.CROSSING) {
             PolyData pdOther = polygons.get(idx);
             if (pdOther != null) {
-                addError(r, new TestError(this, Severity.WARNING, tr("Intersection between multipolygon ways"),
-                        CROSSING_WAYS, Collections.singletonList(r), Arrays.asList(pd.getNodes(), pdOther.getNodes())));
+                errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS)
+                        .message(tr("Intersection between multipolygon ways"))
+                        .primitives(r)
+                        .highlightNodePairs(Arrays.asList(pd.getNodes(), pdOther.getNodes()))
+                        .build());
             }
         }
         return intersection;
@@ -356,37 +381,137 @@ public class MultipolygonTest extends Test {
         for (RelationMember rm : r.getMembers()) {
             if (rm.isWay()) {
                 if (!(rm.hasRole("inner", "outer") || !rm.hasRole())) {
-                    addError(r, new TestError(this, Severity.WARNING, tr("No useful role for multipolygon member"),
-                            WRONG_MEMBER_ROLE, rm.getMember()));
+                    errors.add(TestError.builder(this, Severity.WARNING, WRONG_MEMBER_ROLE)
+                            .message(tr("No useful role for multipolygon member"))
+                            .primitives(addRelationIfNeeded(r, rm.getMember()))
+                            .build());
                 }
             } else {
                 if (!rm.hasRole("admin_centre", "label", "subarea", "land_area")) {
-                    addError(r, new TestError(this, Severity.WARNING, tr("Non-Way in multipolygon"), WRONG_MEMBER_TYPE, rm.getMember()));
+                    errors.add(TestError.builder(this, Severity.WARNING, WRONG_MEMBER_TYPE)
+                            .message(tr("Non-Way in multipolygon"))
+                            .primitives(addRelationIfNeeded(r, rm.getMember()))
+                            .build());
                 }
             }
         }
     }
 
-    private static void addRelationIfNeeded(TestError error, Relation r) {
-        // Fix #8212 : if the error references only incomplete primitives,
+    private static Collection<? extends OsmPrimitive> addRelationIfNeeded(Relation r, OsmPrimitive primitive) {
+        return addRelationIfNeeded(r, Collections.singleton(primitive));
+    }
+
+    private static Collection<? extends OsmPrimitive> addRelationIfNeeded(Relation r, Collection<? extends OsmPrimitive> primitives) {
         // add multipolygon in order to let user select something and fix the error
-        Collection<? extends OsmPrimitive> primitives = error.getPrimitives();
         if (!primitives.contains(r)) {
-            for (OsmPrimitive p : primitives) {
-                if (!p.isIncomplete()) {
-                    return;
-                }
-            }
             // Diamond operator does not work with Java 9 here
             @SuppressWarnings("unused")
             List<OsmPrimitive> newPrimitives = new ArrayList<OsmPrimitive>(primitives);
             newPrimitives.add(0, r);
-            error.setPrimitives(newPrimitives);
+            return newPrimitives;
+        } else {
+            return primitives;
         }
     }
 
-    private void addError(Relation r, TestError error) {
-        addRelationIfNeeded(error, r);
-        errors.add(error);
+    /**
+     * Check for:<ul>
+     * <li>{@link #REPEATED_MEMBER_DIFF_ROLE}: Multipolygon member(s) repeated with different role</li>
+     * <li>{@link #REPEATED_MEMBER_SAME_ROLE}: Multipolygon member(s) repeated with same role</li>
+     * </ul>
+     * @param r relation
+     * @return true if repeated members have been detected, false otherwise
+     */
+    private boolean checkRepeatedWayMembers(Relation r) {
+        boolean hasDups = false;
+        Map<OsmPrimitive, List<RelationMember>> seenMemberPrimitives = new HashMap<>();
+        for (RelationMember rm : r.getMembers()) {
+            List<RelationMember> list = seenMemberPrimitives.get(rm.getMember());
+            if (list == null) {
+                list = new ArrayList<>(2);
+                seenMemberPrimitives.put(rm.getMember(), list);
+            } else {
+                hasDups = true;
+            }
+            list.add(rm);
+        }
+        if (hasDups) {
+            List<OsmPrimitive> repeatedSameRole = new ArrayList<>();
+            List<OsmPrimitive> repeatedDiffRole = new ArrayList<>();
+            for (Entry<OsmPrimitive, List<RelationMember>> e : seenMemberPrimitives.entrySet()) {
+                List<RelationMember> visited = e.getValue();
+                if (e.getValue().size() == 1)
+                    continue;
+                // we found a duplicate member, check if the roles differ
+                boolean rolesDiffer = false;
+                RelationMember rm = visited.get(0);
+                List<OsmPrimitive> primitives = new ArrayList<>();
+                for (int i = 1; i < visited.size(); i++) {
+                    RelationMember v = visited.get(i);
+                    primitives.add(rm.getMember());
+                    if (!v.getRole().equals(rm.getRole())) {
+                        rolesDiffer = true;
+                    }
+                }
+                if (rolesDiffer) {
+                    repeatedDiffRole.addAll(primitives);
+                } else {
+                    repeatedSameRole.addAll(primitives);
+                }
+            }
+            addRepeatedMemberError(r, repeatedDiffRole, REPEATED_MEMBER_DIFF_ROLE, tr("Multipolygon member(s) repeated with different role"));
+            addRepeatedMemberError(r, repeatedSameRole, REPEATED_MEMBER_SAME_ROLE, tr("Multipolygon member(s) repeated with same role"));
+        }
+        return hasDups;
+    }
+
+    private void addRepeatedMemberError(Relation r, List<OsmPrimitive> repeatedMembers, int errorCode, String msg) {
+        if (!repeatedMembers.isEmpty()) {
+            List<OsmPrimitive> prims = new ArrayList<>(1 + repeatedMembers.size());
+            prims.add(r);
+            prims.addAll(repeatedMembers);
+            errors.add(TestError.builder(this, Severity.WARNING, errorCode)
+                    .message(msg)
+                    .primitives(prims)
+                    .highlight(repeatedMembers)
+                    .build());
+        }
+    }
+
+    @Override
+    public Command fixError(TestError testError) {
+        if (testError.getCode() == REPEATED_MEMBER_SAME_ROLE) {
+            ArrayList<OsmPrimitive> primitives = new ArrayList<>(testError.getPrimitives());
+            if (primitives.size() >= 2 && primitives.get(0) instanceof Relation) {
+                Relation oldRel = (Relation) primitives.get(0);
+                Relation newRel = new Relation(oldRel);
+                List<OsmPrimitive> repeatedPrims = primitives.subList(1, primitives.size());
+                List<RelationMember> oldMembers = oldRel.getMembers();
+
+                List<RelationMember> newMembers = new ArrayList<>();
+                HashSet<OsmPrimitive> toRemove = new HashSet<>(repeatedPrims);
+                HashSet<OsmPrimitive> found = new HashSet<>(repeatedPrims.size());
+                for (RelationMember rm : oldMembers) {
+                    if (toRemove.contains(rm.getMember())) {
+                        if (!found.contains(rm.getMember())) {
+                            found.add(rm.getMember());
+                            newMembers.add(rm);
+                        }
+                    } else {
+                        newMembers.add(rm);
+                    }
+                }
+                newRel.setMembers(newMembers);
+                return new ChangeCommand(oldRel, newRel);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean isFixable(TestError testError) {
+        if (testError.getCode() == REPEATED_MEMBER_SAME_ROLE)
+            return true;
+        return false;
     }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java b/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
index 112f943..87b1ece 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
@@ -1,10 +1,10 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.HashSet;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -50,10 +50,10 @@ public class NameMismatch extends Test.TagTest {
      * @param name The name whose translation is missing
      */
     private void missingTranslation(OsmPrimitive p, String name) {
-        errors.add(new TestError(this, Severity.OTHER,
-                tr("Missing name:* translation"),
-                tr("Missing name:*={0}. Add tag with correct language key.", name),
-                String.format("Missing name:*=%s. Add tag with correct language key.", name), NAME_TRANSLATION_MISSING, p));
+        errors.add(TestError.builder(this, Severity.OTHER, NAME_TRANSLATION_MISSING)
+                .message(tr("Missing name:* translation"), marktr("Missing name:*={0}. Add tag with correct language key."), name)
+                .primitives(p)
+                .build());
     }
 
     /**
@@ -65,23 +65,21 @@ public class NameMismatch extends Test.TagTest {
     public void check(OsmPrimitive p) {
         Set<String> names = new HashSet<>();
 
-        for (Entry<String, String> entry : p.getKeys().entrySet()) {
-            if (entry.getKey().startsWith("name:")) {
-                String n = entry.getValue();
-                if (n != null) {
-                    names.add(n);
-                }
+        p.getKeys().forEach((key, n) -> {
+            if (n != null && key.startsWith("name:") && !"name:etymology:wikidata".equals(key)) {
+                names.add(n);
             }
-        }
+        });
 
         if (names.isEmpty()) return;
 
         String name = p.get("name");
 
         if (name == null) {
-            errors.add(new TestError(this, Severity.OTHER,
-                    tr("A name is missing, even though name:* exists."),
-                    NAME_MISSING, p));
+            errors.add(TestError.builder(this, Severity.OTHER, NAME_MISSING)
+                    .message(tr("A name is missing, even though name:* exists."))
+                    .primitives(p)
+                    .build());
             return;
         }
 
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
index c73727d..a676de1 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
@@ -3,9 +3,7 @@ package org.openstreetmap.josm.data.validation.tests;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.InputStreamReader;
 import java.io.Reader;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -19,7 +17,6 @@ import javax.script.ScriptException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.validation.FixableTestError;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -53,7 +50,7 @@ public class OpeningHourTest extends Test.TagTest {
         super.initialize();
         if (ENGINE != null) {
             try (CachedFile cf = new CachedFile("resource://data/validator/opening_hours.js");
-                 Reader reader = new InputStreamReader(cf.getInputStream(), StandardCharsets.UTF_8)) {
+                 Reader reader = cf.getContentReader()) {
                 ENGINE.eval(reader);
                 ENGINE.eval("var opening_hours = require('opening_hours');");
                 // fake country/state to not get errors on holidays
@@ -66,6 +63,7 @@ public class OpeningHourTest extends Test.TagTest {
                         "    return r;" +
                         "  } catch (err) {" +
                         "    return {" +
+                        "      prettifyValue: function() {return null;}," +
                         "      getWarnings: function() {return [];}," +
                         "      getErrors: function() {return [err.toString()]}" +
                         "    };" +
@@ -132,12 +130,13 @@ public class OpeningHourTest extends Test.TagTest {
          * @return The real test error given to JOSM validator. Can be fixable or not if a prettified values has been determined.
          */
         public TestError getTestError(final OsmPrimitive p, final String key) {
-            final String messageEn = message; // todo obtain English message for ignore functionality
+            final TestError.Builder error = TestError.builder(OpeningHourTest.this, severity, 2901)
+                    .message(tr("Opening hours syntax"), message) // todo obtain English message for ignore functionality
+                    .primitives(p);
             if (prettifiedValue == null || prettifiedValue.equals(p.get(key))) {
-                return new TestError(OpeningHourTest.this, severity, tr("Opening hours syntax"), message, messageEn, 2901, p);
+                return error.build();
             } else {
-                return new FixableTestError(OpeningHourTest.this, severity, tr("Opening hours syntax"), message, messageEn, 2901, p,
-                        new ChangePropertyCommand(p, key, prettifiedValue));
+                return error.fix(() -> new ChangePropertyCommand(p, key, prettifiedValue)).build();
             }
         }
 
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java b/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
index 8c8f9d7..ea22cfb 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
@@ -139,9 +139,12 @@ public class OverlappingWays extends Test {
                         type = OVERLAPPING_WAY;
                     }
 
-                    preliminaryErrors.add(new TestError(this,
-                            type < OVERLAPPING_HIGHWAY_AREA ? Severity.WARNING : Severity.OTHER,
-                                    errortype, type, prims, duplicated));
+                    Severity severity = type < OVERLAPPING_HIGHWAY_AREA ? Severity.WARNING : Severity.OTHER;
+                    preliminaryErrors.add(TestError.builder(this, severity, type)
+                            .message(errortype)
+                            .primitives(prims)
+                            .highlightWaySegments(duplicated)
+                            .build());
                     seenWays.put(currentWays, duplicated);
                 } else { /* way seen, mark highlight layer only */
                     highlight.addAll(duplicated);
@@ -201,8 +204,11 @@ public class OverlappingWays extends Test {
 
         final Set<WaySegment> duplicateWaySegment = checkDuplicateWaySegment(w);
         if (duplicateWaySegment != null) {
-            errors.add(new TestError(this, Severity.ERROR, tr("Way contains segment twice"),
-                    DUPLICATE_WAY_SEGMENT, Collections.singleton(w), duplicateWaySegment));
+            errors.add(TestError.builder(this, Severity.ERROR, DUPLICATE_WAY_SEGMENT)
+                    .message(tr("Way contains segment twice"))
+                    .primitives(w)
+                    .highlightWaySegments(duplicateWaySegment)
+                    .build());
             return;
         }
 
diff --git a/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java b/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
index 745d32b..eafda68 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
@@ -6,14 +6,10 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
-import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -47,9 +43,7 @@ public class PowerLines extends Test {
     protected static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
             "portal", "terminal", "insulator");
 
-    private final Map<Way, String> towerPoleTagMap = new HashMap<>();
-
-    private final List<PowerLineError> potentialErrors = new ArrayList<>();
+    private final List<TestError> potentialErrors = new ArrayList<>();
 
     private final List<OsmPrimitive> powerStations = new ArrayList<>();
 
@@ -65,14 +59,17 @@ public class PowerLines extends Test {
         if (w.isUsable()) {
             if (isPowerLine(w) && !w.hasTag("location", "underground")) {
                 String fixValue = null;
-                boolean erroneous = false;
+                TestError.Builder error = null;
+                Node errorNode = null;
                 boolean canFix = false;
                 for (Node n : w.getNodes()) {
                     if (!isPowerTower(n)) {
                         if (!isPowerAllowed(n) && IN_DOWNLOADED_AREA.test(n)) {
                             if (!w.isFirstLastNode(n) || !isPowerStation(n)) {
-                                potentialErrors.add(new PowerLineError(this, n, w));
-                                erroneous = true;
+                                error = TestError.builder(this, Severity.WARNING, POWER_LINES)
+                                        .message(tr("Missing power tower/pole within power line"))
+                                        .primitives(n);
+                                errorNode = n;
                             }
                         }
                     } else if (fixValue == null) {
@@ -84,8 +81,11 @@ public class PowerLines extends Test {
                         canFix = false;
                     }
                 }
-                if (erroneous && canFix) {
-                    towerPoleTagMap.put(w, fixValue);
+                if (error != null && canFix) {
+                    final ChangePropertyCommand fix = new ChangePropertyCommand(errorNode, "power", fixValue);
+                    potentialErrors.add(error.fix(() -> fix).build());
+                } else if (error != null) {
+                    potentialErrors.add(error.build());
                 }
             } else if (w.isClosed() && isPowerStation(w)) {
                 powerStations.add(w);
@@ -103,18 +103,18 @@ public class PowerLines extends Test {
     @Override
     public void startTest(ProgressMonitor progressMonitor) {
         super.startTest(progressMonitor);
-        towerPoleTagMap.clear();
         powerStations.clear();
         potentialErrors.clear();
     }
 
     @Override
     public void endTest() {
-        for (PowerLineError e : potentialErrors) {
-            Node n = e.getNode();
-            if (n != null && !isInPowerStation(n)) {
-                errors.add(e);
-            }
+        for (TestError e : potentialErrors) {
+            e.getPrimitives().stream()
+                    .map(Node.class::cast)
+                    .filter(n -> !isInPowerStation(n))
+                    .findAny()
+                    .ifPresent(ignore -> errors.add(e));
         }
         potentialErrors.clear();
         super.endTest();
@@ -142,24 +142,6 @@ public class PowerLines extends Test {
         return false;
     }
 
-    @Override
-    public Command fixError(TestError testError) {
-        if (testError instanceof PowerLineError && isFixable(testError)) {
-            // primitives list can be empty if all primitives have been purged
-            Iterator<? extends OsmPrimitive> it = testError.getPrimitives().iterator();
-            if (it.hasNext()) {
-                return new ChangePropertyCommand(it.next(),
-                        "power", towerPoleTagMap.get(((PowerLineError) testError).line));
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isFixable(TestError testError) {
-        return testError instanceof PowerLineError && towerPoleTagMap.containsKey(((PowerLineError) testError).line);
-    }
-
     /**
      * Determines if the specified way denotes a power line.
      * @param w The way to be tested
@@ -217,20 +199,4 @@ public class PowerLines extends Test {
         String v = p.get("building");
         return v != null && values != null && values.contains(v);
     }
-
-    protected static class PowerLineError extends TestError {
-        private final Way line;
-
-        public PowerLineError(PowerLines tester, Node n, Way line) {
-            super(tester, Severity.WARNING,
-                    tr("Missing power tower/pole within power line"), POWER_LINES, n);
-            this.line = line;
-        }
-
-        public final Node getNode() {
-            // primitives list can be empty if all primitives have been purged
-            Iterator<? extends OsmPrimitive> it = getPrimitives().iterator();
-            return it.hasNext() ? (Node) it.next() : null;
-        }
-    }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java b/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java
index 6575156..4277575 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.data.validation.tests;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -47,7 +46,10 @@ public class PublicTransportRouteTest extends Test {
         final Set<Node> routeNodes = new HashSet<>();
         for (RelationMember member : r.getMembers()) {
             if (member.hasRole("forward", "backward")) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Route relation contains a ''{0}'' role", "forward/backward"), 3601, r));
+                errors.add(TestError.builder(this, Severity.WARNING, 3601)
+                        .message(tr("Route relation contains a ''{0}'' role", "forward/backward"))
+                        .primitives(r)
+                        .build());
                 return;
             } else if (member.hasRole("") && OsmPrimitiveType.WAY.equals(member.getType())) {
                 membersToCheck.add(member);
@@ -66,7 +68,10 @@ public class PublicTransportRouteTest extends Test {
                     || link.direction == null
                     || WayConnectionType.Direction.NONE.equals(link.direction);
             if (hasError) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Route relation contains a gap"), 3602, r));
+                errors.add(TestError.builder(this, Severity.WARNING, 3602)
+                        .message(tr("Route relation contains a gap"))
+                        .primitives(r)
+                        .build());
                 return;
             }
         }
@@ -75,8 +80,10 @@ public class PublicTransportRouteTest extends Test {
             if (member.hasRole("stop", "stop_exit_only", "stop_entry_only")
                     && OsmPrimitiveType.NODE.equals(member.getType())
                     && !routeNodes.contains(member.getNode())) {
-                errors.add(new TestError(this, Severity.WARNING,
-                        tr("Stop position not part of route"), 3603, Arrays.asList(member.getMember(), r)));
+                errors.add(TestError.builder(this, Severity.WARNING, 3603)
+                        .message(tr("Stop position not part of route"))
+                        .primitives(member.getMember(), r)
+                        .build());
             }
         }
     }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
index 027ff66..efb32ac 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.data.validation.tests;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -16,6 +15,7 @@ import java.util.stream.Collectors;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.validation.Severity;
@@ -114,16 +114,23 @@ public class RelationChecker extends Test {
         Map<String, RolePreset> allroles = buildAllRoles(n);
         if (allroles.isEmpty() && n.hasTag("type", "route")
                 && n.hasTag("route", "train", "subway", "monorail", "tram", "bus", "trolleybus", "aerialway", "ferry")) {
-            errors.add(new TestError(this, Severity.WARNING,
-                    tr("Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)", "public_transport:version", "2", "1"),
-                    RELATION_UNKNOWN, n));
+            errors.add(TestError.builder(this, Severity.WARNING, RELATION_UNKNOWN)
+                    .message(tr("Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)", "public_transport:version", "2", "1"))
+                    .primitives(n)
+                    .build());
         } else if (allroles.isEmpty()) {
-            errors.add(new TestError(this, Severity.WARNING, tr("Relation type is unknown"), RELATION_UNKNOWN, n));
+            errors.add(TestError.builder(this, Severity.WARNING, RELATION_UNKNOWN)
+                    .message(tr("Relation type is unknown"))
+                    .primitives(n)
+                    .build());
         }
 
         Map<String, RoleInfo> map = buildRoleInfoMap(n);
         if (map.isEmpty()) {
-            errors.add(new TestError(this, Severity.ERROR, tr("Relation is empty"), RELATION_EMPTY, n));
+            errors.add(TestError.builder(this, Severity.ERROR, RELATION_EMPTY)
+                    .message(tr("Relation is empty"))
+                    .primitives(n)
+                    .build());
         } else if (!allroles.isEmpty()) {
             checkRoles(n, allroles, map);
         }
@@ -199,11 +206,11 @@ public class RelationChecker extends Test {
      *
      */
     private boolean checkMemberExpressionAndType(RolePreset rolePreset, RelationMember member, Relation n) {
-        TestError possibleMatchError = null;
         if (rolePreset == null || rolePreset.roles == null) {
             // no restrictions on role types
             return true;
         }
+        TestError possibleMatchError = null;
         // iterate through all of the role definition within preset
         // and look for any matching definition
         for (Role r: rolePreset.roles) {
@@ -228,14 +235,19 @@ public class RelationChecker extends Test {
                             // we still need to iterate further, as we might have
                             // different present, for which memberExpression will match
                             // but stash the error in case no better reason will be found later
-                            String s = marktr("Role member does not match expression {0} in template {1}");
-                            possibleMatchError = new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,
-                                    tr(s, r.memberExpression, rolePreset.name), s, WRONG_TYPE,
-                                    member.getMember().isUsable() ? member.getMember() : n);
-
+                            possibleMatchError = TestError.builder(this, Severity.WARNING, WRONG_TYPE)
+                                    .message(ROLE_VERIF_PROBLEM_MSG,
+                                            marktr("Role member does not match expression {0} in template {1}"),
+                                            r.memberExpression, rolePreset.name)
+                                    .primitives(member.getMember().isUsable() ? member.getMember() : n)
+                                    .build();
                         }
                     }
                 }
+            } else if (OsmPrimitiveType.RELATION.equals(member.getType()) && !member.getMember().isUsable()
+                    && r.types.contains(TaggingPresetType.MULTIPOLYGON)) {
+                // if relation is incomplete we cannot verify if it's a multipolygon - so we just skip it
+                return true;
             }
         }
 
@@ -247,7 +259,6 @@ public class RelationChecker extends Test {
         } else {
             // no errors found till now. So member at least failed at matching the type
             // it could also fail at memberExpression, but we can't guess at which
-            String s = marktr("Role member type {0} does not match accepted list of {1} in template {2}");
 
             // prepare Set of all accepted types in template
             Collection<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
@@ -258,9 +269,12 @@ public class RelationChecker extends Test {
             // convert in localization friendly way to string of accepted types
             String typesStr = types.stream().map(x -> tr(x.getName())).collect(Collectors.joining("/"));
 
-            errors.add(new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,
-                    tr(s, member.getType(), typesStr, rolePreset.name), s, WRONG_TYPE,
-                    member.getMember().isUsable() ? member.getMember() : n));
+            errors.add(TestError.builder(this, Severity.WARNING, WRONG_TYPE)
+                    .message(ROLE_VERIF_PROBLEM_MSG,
+                            marktr("Role member type {0} does not match accepted list of {1} in template {2}"),
+                            member.getType(), typesStr, rolePreset.name)
+                    .primitives(member.getMember().isUsable() ? member.getMember() : n)
+                    .build());
         }
         return false;
     }
@@ -296,14 +310,16 @@ public class RelationChecker extends Test {
                 String templates = allroles.keySet().stream().map(I18n::tr).collect(Collectors.joining("/"));
 
                 if (!key.isEmpty()) {
-                    String s = marktr("Role {0} unknown in templates {1}");
 
-                    errors.add(new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,
-                            tr(s, key, templates), MessageFormat.format(s, key), ROLE_UNKNOWN, n));
+                    errors.add(TestError.builder(this, Severity.WARNING, ROLE_UNKNOWN)
+                            .message(ROLE_VERIF_PROBLEM_MSG, marktr("Role {0} unknown in templates {1}"), key, templates)
+                            .primitives(n)
+                            .build());
                 } else {
-                    String s = marktr("Empty role type found when expecting one of {0}");
-                    errors.add(new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,
-                            tr(s, templates), s, ROLE_EMPTY, n));
+                    errors.add(TestError.builder(this, Severity.WARNING, ROLE_EMPTY)
+                            .message(ROLE_VERIF_PROBLEM_MSG, marktr("Empty role type found when expecting one of {0}"), templates)
+                            .primitives(n)
+                            .build());
                 }
             }
         }
@@ -314,17 +330,20 @@ public class RelationChecker extends Test {
         long vc = r.getValidCount(count);
         if (count != vc) {
             if (count == 0) {
-                String s = marktr("Role {0} missing");
-                errors.add(new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,
-                        tr(s, keyname), MessageFormat.format(s, keyname), ROLE_MISSING, n));
+                errors.add(TestError.builder(this, Severity.WARNING, ROLE_MISSING)
+                        .message(ROLE_VERIF_PROBLEM_MSG, marktr("Role {0} missing"), keyname)
+                        .primitives(n)
+                        .build());
             } else if (vc > count) {
-                String s = marktr("Number of {0} roles too low ({1})");
-                errors.add(new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,
-                        tr(s, keyname, count), MessageFormat.format(s, keyname, count), LOW_COUNT, n));
+                errors.add(TestError.builder(this, Severity.WARNING, LOW_COUNT)
+                        .message(ROLE_VERIF_PROBLEM_MSG, marktr("Number of {0} roles too low ({1})"), keyname, count)
+                        .primitives(n)
+                        .build());
             } else {
-                String s = marktr("Number of {0} roles too high ({1})");
-                errors.add(new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,
-                        tr(s, keyname, count), MessageFormat.format(s, keyname, count), HIGH_COUNT, n));
+                errors.add(TestError.builder(this, Severity.WARNING, HIGH_COUNT)
+                        .message(ROLE_VERIF_PROBLEM_MSG, marktr("Number of {0} roles too high ({1})"), keyname, count)
+                        .primitives(n)
+                        .build());
             }
         }
     }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java b/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java
index e28082c..ff51edd 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.data.validation.tests;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -32,13 +31,14 @@ public class SelfIntersectingWay extends Test {
     @Override
     public void visit(Way w) {
         Set<Node> nodes = new HashSet<>();
-
         for (int i = 1; i < w.getNodesCount() - 1; i++) {
             Node n = w.getNode(i);
             if (nodes.contains(n)) {
-                errors.add(new TestError(this,
-                        Severity.WARNING, tr("Self-intersecting ways"), SELF_INTERSECT,
-                        Arrays.asList(w), Arrays.asList(n)));
+                errors.add(TestError.builder(this, Severity.WARNING, SELF_INTERSECT)
+                        .message(tr("Self-intersecting ways"))
+                        .primitives(w)
+                        .highlight(n)
+                        .build());
                 break;
             } else {
                 nodes.add(n);
diff --git a/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java b/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
index 00dfe3a..d91e063 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
@@ -96,7 +96,10 @@ public class SimilarNamedWays extends Test {
                     List<OsmPrimitive> primitives = new ArrayList<>(2);
                     primitives.add(w);
                     primitives.add(w2);
-                    errors.add(new TestError(this, Severity.WARNING, tr("Similarly named ways"), SIMILAR_NAMED, primitives));
+                    errors.add(TestError.builder(this, Severity.WARNING, SIMILAR_NAMED)
+                            .message(tr("Similarly named ways"))
+                            .primitives(primitives)
+                            .build());
                     errorWays.put(w, w2);
                 }
             }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
index cc8ed73..b6bc6e9 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
@@ -8,8 +8,6 @@ import java.awt.GridBagConstraints;
 import java.awt.event.ActionListener;
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -37,7 +35,6 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.data.validation.FixableTestError;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test.TagTest;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -52,7 +49,6 @@ import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup;
 import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
 import org.openstreetmap.josm.gui.widgets.EditableList;
 import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
@@ -168,8 +164,7 @@ public class TagChecker extends TagTest {
         for (String source : Main.pref.getCollection(PREF_SOURCES, DEFAULT_SOURCES)) {
             try (
                 CachedFile cf = new CachedFile(source);
-                InputStream s = cf.getInputStream();
-                BufferedReader reader = new BufferedReader(UTFInputStreamReader.create(s));
+                BufferedReader reader = cf.getContentReader()
             ) {
                 String okValue = null;
                 boolean tagcheckerfile = false;
@@ -394,8 +389,10 @@ public class TagChecker extends TagTest {
             Map<String, String> keys = p.getKeys();
             for (CheckerData d : checkerData) {
                 if (d.match(p, keys)) {
-                    errors.add(new TestError(this, d.getSeverity(), tr("Suspicious tag/value combinations"),
-                            d.getDescription(), d.getDescriptionOrig(), d.getCode(), p));
+                    errors.add(TestError.builder(this, d.getSeverity(), d.getCode())
+                            .message(tr("Suspicious tag/value combinations"), d.getDescription())
+                            .primitives(p)
+                            .build());
                     withErrors.put(p, "TC");
                 }
             }
@@ -406,48 +403,66 @@ public class TagChecker extends TagTest {
             String key = prop.getKey();
             String value = prop.getValue();
             if (checkValues && (containsLow(value)) && !withErrors.contains(p, "ICV")) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Tag value contains character with code less than 0x20"),
-                        tr(s, key), MessageFormat.format(s, key), LOW_CHAR_VALUE, p));
+                errors.add(TestError.builder(this, Severity.WARNING, LOW_CHAR_VALUE)
+                        .message(tr("Tag value contains character with code less than 0x20"), s, key)
+                        .primitives(p)
+                        .build());
                 withErrors.put(p, "ICV");
             }
             if (checkKeys && (containsLow(key)) && !withErrors.contains(p, "ICK")) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Tag key contains character with code less than 0x20"),
-                        tr(s, key), MessageFormat.format(s, key), LOW_CHAR_KEY, p));
+                errors.add(TestError.builder(this, Severity.WARNING, LOW_CHAR_KEY)
+                        .message(tr("Tag key contains character with code less than 0x20"), s, key)
+                        .primitives(p)
+                        .build());
                 withErrors.put(p, "ICK");
             }
             if (checkValues && (value != null && value.length() > 255) && !withErrors.contains(p, "LV")) {
-                errors.add(new TestError(this, Severity.ERROR, tr("Tag value longer than allowed"),
-                        tr(s, key), MessageFormat.format(s, key), LONG_VALUE, p));
+                errors.add(TestError.builder(this, Severity.ERROR, LONG_VALUE)
+                        .message(tr("Tag value longer than allowed"), s, key)
+                        .primitives(p)
+                        .build());
                 withErrors.put(p, "LV");
             }
             if (checkKeys && (key != null && key.length() > 255) && !withErrors.contains(p, "LK")) {
-                errors.add(new TestError(this, Severity.ERROR, tr("Tag key longer than allowed"),
-                        tr(s, key), MessageFormat.format(s, key), LONG_KEY, p));
+                errors.add(TestError.builder(this, Severity.ERROR, LONG_KEY)
+                        .message(tr("Tag key longer than allowed"), s, key)
+                        .primitives(p)
+                        .build());
                 withErrors.put(p, "LK");
             }
             if (checkValues && (value == null || value.trim().isEmpty()) && !withErrors.contains(p, "EV")) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Tags with empty values"),
-                        tr(s, key), MessageFormat.format(s, key), EMPTY_VALUES, p));
+                errors.add(TestError.builder(this, Severity.WARNING, EMPTY_VALUES)
+                        .message(tr("Tags with empty values"), s, key)
+                        .primitives(p)
+                        .build());
                 withErrors.put(p, "EV");
             }
             if (checkKeys && key != null && key.indexOf(' ') >= 0 && !withErrors.contains(p, "IPK")) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Invalid white space in property key"),
-                        tr(s, key), MessageFormat.format(s, key), INVALID_KEY_SPACE, p));
+                errors.add(TestError.builder(this, Severity.WARNING, INVALID_KEY_SPACE)
+                        .message(tr("Invalid white space in property key"), s, key)
+                        .primitives(p)
+                        .build());
                 withErrors.put(p, "IPK");
             }
             if (checkValues && value != null && (value.startsWith(" ") || value.endsWith(" ")) && !withErrors.contains(p, "SPACE")) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Property values start or end with white space"),
-                        tr(s, key), MessageFormat.format(s, key), INVALID_SPACE, p));
+                errors.add(TestError.builder(this, Severity.WARNING, INVALID_SPACE)
+                        .message(tr("Property values start or end with white space"), s, key)
+                        .primitives(p)
+                        .build());
                 withErrors.put(p, "SPACE");
             }
             if (checkValues && value != null && value.contains("  ") && !withErrors.contains(p, "SPACE")) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Property values contain multiple white spaces"),
-                        tr(s, key), MessageFormat.format(s, key), MULTIPLE_SPACES, p));
+                errors.add(TestError.builder(this, Severity.WARNING, MULTIPLE_SPACES)
+                        .message(tr("Property values contain multiple white spaces"), s, key)
+                        .primitives(p)
+                        .build());
                 withErrors.put(p, "SPACE");
             }
             if (checkValues && value != null && !value.equals(Entities.unescape(value)) && !withErrors.contains(p, "HTML")) {
-                errors.add(new TestError(this, Severity.OTHER, tr("Property values contain HTML entity"),
-                        tr(s, key), MessageFormat.format(s, key), INVALID_HTML, p));
+                errors.add(TestError.builder(this, Severity.OTHER, INVALID_HTML)
+                        .message(tr("Property values contain HTML entity"), s, key)
+                        .primitives(p)
+                        .build());
                 withErrors.put(p, "HTML");
             }
             if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null) {
@@ -457,24 +472,20 @@ public class TagChecker extends TagTest {
                         String fixedKey = harmonizedKeys.get(prettifiedKey);
                         if (fixedKey != null && !"".equals(fixedKey) && !fixedKey.equals(key)) {
                             // misspelled preset key
-                            String i = marktr("Key ''{0}'' looks like ''{1}''.");
-                            final TestError error;
+                            final TestError.Builder error = TestError.builder(this, Severity.WARNING, MISSPELLED_KEY)
+                                    .message(tr("Misspelled property key"), marktr("Key ''{0}'' looks like ''{1}''."), key, fixedKey)
+                                    .primitives(p);
                             if (p.hasKey(fixedKey)) {
-                                error = new TestError(this, Severity.WARNING, tr("Misspelled property key"),
-                                        tr(i, key, fixedKey),
-                                        MessageFormat.format(i, key, fixedKey), MISSPELLED_KEY, p);
+                                errors.add(error.build());
                             } else {
-                                error = new FixableTestError(this, Severity.WARNING, tr("Misspelled property key"),
-                                        tr(i, key, fixedKey),
-                                        MessageFormat.format(i, key, fixedKey), MISSPELLED_KEY, p,
-                                        new ChangePropertyKeyCommand(p, key, fixedKey));
+                                errors.add(error.fix(() -> new ChangePropertyKeyCommand(p, key, fixedKey)).build());
                             }
-                            errors.add(error);
                             withErrors.put(p, "WPK");
                         } else {
-                            String i = marktr("Key ''{0}'' not in presets.");
-                            errors.add(new TestError(this, Severity.OTHER, tr("Presets do not contain property key"),
-                                    tr(i, key), MessageFormat.format(i, key), INVALID_VALUE, p));
+                            errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
+                                    .message(tr("Presets do not contain property key"), marktr("Key ''{0}'' not in presets."), key)
+                                    .primitives(p)
+                                    .build());
                             withErrors.put(p, "UPK");
                         }
                     } else if (!isTagInPresets(key, value)) {
@@ -482,18 +493,22 @@ public class TagChecker extends TagTest {
                         String fixedValue = harmonizeValue(prop.getValue());
                         Map<String, String> possibleValues = getPossibleValues(presetsValueData.get(key));
                         if (possibleValues.containsKey(fixedValue)) {
-                            fixedValue = possibleValues.get(fixedValue);
+                            final String newKey = possibleValues.get(fixedValue);
                             // misspelled preset value
-                            String i = marktr("Value ''{0}'' for key ''{1}'' looks like ''{2}''.");
-                            errors.add(new FixableTestError(this, Severity.WARNING, tr("Misspelled property value"),
-                                    tr(i, prop.getValue(), key, fixedValue), MessageFormat.format(i, prop.getValue(), fixedValue),
-                                    MISSPELLED_VALUE, p, new ChangePropertyCommand(p, key, fixedValue)));
+                            errors.add(TestError.builder(this, Severity.WARNING, MISSPELLED_VALUE)
+                                    .message(tr("Misspelled property value"),
+                                            marktr("Value ''{0}'' for key ''{1}'' looks like ''{2}''."), prop.getValue(), key, fixedValue)
+                                    .primitives(p)
+                                    .fix(() -> new ChangePropertyCommand(p, key, newKey))
+                                    .build());
                             withErrors.put(p, "WPV");
                         } else {
                             // unknown preset value
-                            String i = marktr("Value ''{0}'' for key ''{1}'' not in presets.");
-                            errors.add(new TestError(this, Severity.OTHER, tr("Presets do not contain property value"),
-                                    tr(i, prop.getValue(), key), MessageFormat.format(i, prop.getValue(), key), INVALID_VALUE, p));
+                            errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
+                                    .message(tr("Presets do not contain property value"),
+                                            marktr("Value ''{0}'' for key ''{1}'' not in presets."), prop.getValue(), key)
+                                    .primitives(p)
+                                    .build());
                             withErrors.put(p, "UPV");
                         }
                     }
@@ -504,8 +519,10 @@ public class TagChecker extends TagTest {
                         || value.contains("check and delete")
                         || key.contains("todo") || key.toLowerCase(Locale.ENGLISH).contains("fixme"))
                         && !withErrors.contains(p, "FIXME")) {
-                    errors.add(new TestError(this, Severity.OTHER,
-                            tr("FIXMES"), FIXME, p));
+                    errors.add(TestError.builder(this, Severity.OTHER, FIXME)
+                            .message(tr("FIXMES"))
+                            .primitives(p)
+                            .build());
                     withErrors.put(p, "FIXME");
                 }
             }
@@ -648,30 +665,26 @@ public class TagChecker extends TagTest {
     public Command fixError(TestError testError) {
         List<Command> commands = new ArrayList<>(50);
 
-        if (testError instanceof FixableTestError) {
-            commands.add(testError.getFix());
-        } else {
-            Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
-            for (OsmPrimitive p : primitives) {
-                Map<String, String> tags = p.getKeys();
-                if (tags == null || tags.isEmpty()) {
-                    continue;
-                }
+        Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+        for (OsmPrimitive p : primitives) {
+            Map<String, String> tags = p.getKeys();
+            if (tags == null || tags.isEmpty()) {
+                continue;
+            }
 
-                for (Entry<String, String> prop: tags.entrySet()) {
-                    String key = prop.getKey();
-                    String value = prop.getValue();
-                    if (value == null || value.trim().isEmpty()) {
-                        commands.add(new ChangePropertyCommand(p, key, null));
-                    } else if (value.startsWith(" ") || value.endsWith(" ") || value.contains("  ")) {
-                        commands.add(new ChangePropertyCommand(p, key, Tag.removeWhiteSpaces(value)));
-                    } else if (key.startsWith(" ") || key.endsWith(" ") || key.contains("  ")) {
-                        commands.add(new ChangePropertyKeyCommand(p, key, Tag.removeWhiteSpaces(key)));
-                    } else {
-                        String evalue = Entities.unescape(value);
-                        if (!evalue.equals(value)) {
-                            commands.add(new ChangePropertyCommand(p, key, evalue));
-                        }
+            for (Entry<String, String> prop: tags.entrySet()) {
+                String key = prop.getKey();
+                String value = prop.getValue();
+                if (value == null || value.trim().isEmpty()) {
+                    commands.add(new ChangePropertyCommand(p, key, null));
+                } else if (value.startsWith(" ") || value.endsWith(" ") || value.contains("  ")) {
+                    commands.add(new ChangePropertyCommand(p, key, Tag.removeWhiteSpaces(value)));
+                } else if (key.startsWith(" ") || key.endsWith(" ") || key.contains("  ")) {
+                    commands.add(new ChangePropertyKeyCommand(p, key, Tag.removeWhiteSpaces(key)));
+                } else {
+                    String evalue = Entities.unescape(value);
+                    if (!evalue.equals(value)) {
+                        commands.add(new ChangePropertyCommand(p, key, evalue));
                     }
                 }
             }
@@ -842,10 +855,6 @@ public class TagChecker extends TagTest {
         }
 
         public String getDescription() {
-            return tr(description);
-        }
-
-        public String getDescriptionOrig() {
             return description;
         }
 
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java b/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java
index 70a9fa7..1953df2 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java
@@ -4,8 +4,6 @@ package org.openstreetmap.josm.data.validation.tests;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -98,8 +96,11 @@ public class TurnrestrictionTest extends Test {
                     }
                     break;
                 default:
-                    errors.add(new TestError(this, Severity.WARNING, tr("Unknown role"), UNKNOWN_ROLE,
-                            l, Collections.singletonList(m)));
+                    errors.add(TestError.builder(this, Severity.WARNING, UNKNOWN_ROLE)
+                            .message(tr("Unknown role"))
+                            .primitives(l)
+                            .highlight(m.getMember())
+                            .build());
                 }
             } else if (m.isNode()) {
                 Node n = m.getNode();
@@ -114,41 +115,71 @@ public class TurnrestrictionTest extends Test {
                         via.add(n);
                     }
                 } else {
-                    errors.add(new TestError(this, Severity.WARNING, tr("Unknown role"), UNKNOWN_ROLE,
-                            l, Collections.singletonList(m)));
+                    errors.add(TestError.builder(this, Severity.WARNING, UNKNOWN_ROLE)
+                            .message(tr("Unknown role"))
+                            .primitives(l)
+                            .highlight(m.getMember())
+                            .build());
                 }
             } else {
-                errors.add(new TestError(this, Severity.WARNING, tr("Unknown member type"), UNKNOWN_TYPE,
-                        l, Collections.singletonList(m)));
+                errors.add(TestError.builder(this, Severity.WARNING, UNKNOWN_TYPE)
+                        .message(tr("Unknown member type"))
+                        .primitives(l)
+                        .highlight(m.getMember())
+                        .build());
             }
         }
         if (morefrom) {
-            errors.add(new TestError(this, Severity.ERROR, tr("More than one \"from\" way found"), MORE_FROM, r));
+            errors.add(TestError.builder(this, Severity.ERROR, MORE_FROM)
+                    .message(tr("More than one \"from\" way found"))
+                    .primitives(r)
+                    .build());
         }
         if (moreto) {
-            errors.add(new TestError(this, Severity.ERROR, tr("More than one \"to\" way found"), MORE_TO, r));
+            errors.add(TestError.builder(this, Severity.ERROR, MORE_TO)
+                    .message(tr("More than one \"to\" way found"))
+                    .primitives(r)
+                    .build());
         }
         if (morevia) {
-            errors.add(new TestError(this, Severity.ERROR, tr("More than one \"via\" node found"), MORE_VIA, r));
+            errors.add(TestError.builder(this, Severity.ERROR, MORE_VIA)
+                    .message(tr("More than one \"via\" node found"))
+                    .primitives(r)
+                    .build());
         }
         if (mixvia) {
-            errors.add(new TestError(this, Severity.ERROR, tr("Cannot mix node and way for role \"via\""), MIX_VIA, r));
+            errors.add(TestError.builder(this, Severity.ERROR, MIX_VIA)
+                    .message(tr("Cannot mix node and way for role \"via\""))
+                    .primitives(r)
+                    .build());
         }
 
         if (fromWay == null) {
-            errors.add(new TestError(this, Severity.ERROR, tr("No \"from\" way found"), NO_FROM, r));
+            errors.add(TestError.builder(this, Severity.ERROR, NO_FROM)
+                    .message(tr("No \"from\" way found"))
+                    .primitives(r)
+                    .build());
             return;
         }
         if (toWay == null) {
-            errors.add(new TestError(this, Severity.ERROR, tr("No \"to\" way found"), NO_TO, r));
+            errors.add(TestError.builder(this, Severity.ERROR, NO_TO)
+                    .message(tr("No \"to\" way found"))
+                    .primitives(r)
+                    .build());
             return;
         }
         if (fromWay.equals(toWay)) {
-            errors.add(new TestError(this, r.hasTag("restriction", "no_u_turn") ? Severity.OTHER : Severity.WARNING,
-                    tr("\"from\" way equals \"to\" way"), FROM_EQUALS_TO, r));
+            Severity severity = r.hasTag("restriction", "no_u_turn") ? Severity.OTHER : Severity.WARNING;
+            errors.add(TestError.builder(this, severity, FROM_EQUALS_TO)
+                    .message(tr("\"from\" way equals \"to\" way"))
+                    .primitives(r)
+                    .build());
         }
         if (via.isEmpty()) {
-            errors.add(new TestError(this, Severity.ERROR, tr("No \"via\" node or way found"), NO_VIA, r));
+            errors.add(TestError.builder(this, Severity.ERROR, NO_VIA)
+                    .message(tr("No \"via\" node or way found"))
+                    .primitives(r)
+                    .build());
             return;
         }
 
@@ -159,7 +190,10 @@ public class TurnrestrictionTest extends Test {
             checkIfConnected(fromWay, viaPseudoWay,
                     tr("The \"from\" way does not start or end at a \"via\" node."), FROM_VIA_NODE);
             if (toWay.isOneway() != 0 && viaNode.equals(toWay.lastNode(true))) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Superfluous turnrestriction as \"to\" way is oneway"), SUPERFLUOUS, r));
+                errors.add(TestError.builder(this, Severity.WARNING, SUPERFLUOUS)
+                        .message(tr("Superfluous turnrestriction as \"to\" way is oneway"))
+                        .primitives(r)
+                        .build());
                 return;
             }
             checkIfConnected(viaPseudoWay, toWay,
@@ -177,7 +211,10 @@ public class TurnrestrictionTest extends Test {
                 }
             }
             if (toWay.isOneway() != 0 && ((Way) via.get(via.size() - 1)).isFirstLastNode(toWay.lastNode(true))) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Superfluous turnrestriction as \"to\" way is oneway"), SUPERFLUOUS, r));
+                errors.add(TestError.builder(this, Severity.WARNING, SUPERFLUOUS)
+                        .message(tr("Superfluous turnrestriction as \"to\" way is oneway"))
+                        .primitives(r)
+                        .build());
                 return;
             }
             checkIfConnected((Way) via.get(via.size() - 1), toWay,
@@ -205,7 +242,10 @@ public class TurnrestrictionTest extends Test {
             c = current.isFirstLastNode(previous.firstNode()) || current.isFirstLastNode(previous.lastNode());
         }
         if (!c) {
-            errors.add(new TestError(this, Severity.ERROR, msg, code, Arrays.asList(previous, current)));
+            errors.add(TestError.builder(this, Severity.ERROR, code)
+                    .message(msg)
+                    .primitives(previous, current)
+                    .build());
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
index 00dd837..3043bc4 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.data.validation.tests;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -95,15 +94,11 @@ public class UnclosedWays extends Test {
         public final TestError getTestError(Way w, UnclosedWays test) {
             String value = w.get(key);
             if (isValueErroneous(value)) {
-                // CHECKSTYLE.OFF: SingleSpaceSeparator
-                String  type = engMessage.contains("{0}") ? tr(engMessage, tr(value)) : tr(engMessage);
-                String etype = engMessage.contains("{0}") ? MessageFormat.format(engMessage, value) : engMessage;
-                // CHECKSTYLE.ON: SingleSpaceSeparator
-                return new TestError(test, Severity.WARNING, tr("Unclosed way"),
-                        type, etype, code, Arrays.asList(w),
-                        // The important parts of an unclosed way are the first and
-                        // the last node which should be connected, therefore we highlight them
-                        Arrays.asList(w.firstNode(), w.lastNode()));
+                return TestError.builder(test, Severity.WARNING, code)
+                        .message(tr("Unclosed way"), engMessage, engMessage.contains("{0}") ? new Object[]{value} : new Object[]{})
+                        .primitives(w)
+                        .highlight(Arrays.asList(w.firstNode(), w.lastNode()))
+                        .build();
             }
             return null;
         }
@@ -144,7 +139,7 @@ public class UnclosedWays extends Test {
         new UnclosedWaysCheck(1102, "landuse",   marktr("landuse type {0}")),
         new UnclosedWaysCheck(1103, "amenities", marktr("amenities type {0}")),
         new UnclosedWaysCheck(1104, "sport",     marktr("sport type {0}"),
-                new HashSet<>(Arrays.asList("water_slide", "climbing"))),
+                new HashSet<>(Arrays.asList("water_slide", "climbing", "skiing"))),
         new UnclosedWaysCheck(1105, "tourism",   marktr("tourism type {0}"),
                 new HashSet<>(Arrays.asList("attraction", "artwork"))),
         new UnclosedWaysCheck(1106, "shop",      marktr("shop type {0}")),
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
index 96d45b0..71e42d9 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
@@ -7,7 +7,6 @@ import java.awt.geom.Area;
 import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -263,9 +262,11 @@ public abstract class UnconnectedWays extends Test {
 
     protected final void addErrors(Severity severity, Map<Node, Way> errorMap, String message) {
         for (Map.Entry<Node, Way> error : errorMap.entrySet()) {
-            errors.add(new TestError(this, severity, message, UNCONNECTED_WAYS,
-                    Arrays.asList(error.getKey(), error.getValue()),
-                    Arrays.asList(error.getKey())));
+            errors.add(TestError.builder(this, severity, UNCONNECTED_WAYS)
+                    .message(message)
+                    .primitives(error.getKey(), error.getValue())
+                    .highlight(error.getKey())
+                    .build());
         }
     }
 
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java b/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
index 3dee201..cfb76dc 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
@@ -43,8 +43,10 @@ public class UntaggedNode extends Test implements AbstractPrimitive.KeyValueVisi
         if (n.isUsable() && !n.isTagged() && n.getReferrers().isEmpty()) {
 
             if (!n.hasKeys() && IN_DOWNLOADED_AREA.test(n)) {
-                String msg = marktr("No tags");
-                errors.add(new TestError(this, Severity.WARNING, ERROR_MESSAGE, tr(msg), msg, UNTAGGED_NODE_BLANK, n));
+                errors.add(TestError.builder(this, Severity.WARNING, UNTAGGED_NODE_BLANK)
+                        .message(ERROR_MESSAGE, marktr("No tags"))
+                        .primitives(n)
+                        .build());
                 return;
             }
             n.visitKeys(this);
@@ -55,8 +57,10 @@ public class UntaggedNode extends Test implements AbstractPrimitive.KeyValueVisi
     public void visitKeyValue(AbstractPrimitive n, String key, String value) {
         if (key.toLowerCase(Locale.ENGLISH).contains("fixme") || value.toLowerCase(Locale.ENGLISH).contains("fixme")) {
             /* translation note: don't translate quoted words */
-            String msg = marktr("Has tag containing ''fixme'' or ''FIXME''");
-            errors.add(new TestError(this, Severity.WARNING, ERROR_MESSAGE, tr(msg), msg, UNTAGGED_NODE_FIXME, (OsmPrimitive) n));
+            errors.add(TestError.builder(this, Severity.WARNING, UNTAGGED_NODE_FIXME)
+                    .message(ERROR_MESSAGE, marktr("Has tag containing ''fixme'' or ''FIXME''"))
+                    .primitives((OsmPrimitive) n)
+                    .build());
             return;
         }
 
@@ -80,11 +84,17 @@ public class UntaggedNode extends Test implements AbstractPrimitive.KeyValueVisi
             code = UNTAGGED_NODE_SOURCE;
         }
         if (msg != null) {
-            errors.add(new TestError(this, Severity.WARNING, ERROR_MESSAGE, tr(msg), msg, code, (OsmPrimitive) n));
+            errors.add(TestError.builder(this, Severity.WARNING, code)
+                    .message(ERROR_MESSAGE, msg)
+                    .primitives((OsmPrimitive) n)
+                    .build());
             return;
         }
         // Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
-        errors.add(new TestError(this, Severity.WARNING, ERROR_MESSAGE, tr("Other"), "Other", UNTAGGED_NODE_OTHER, (OsmPrimitive) n));
+        errors.add(TestError.builder(this, Severity.WARNING, UNTAGGED_NODE_OTHER)
+                .message(ERROR_MESSAGE, marktr("Other"))
+                .primitives((OsmPrimitive) n)
+                .build());
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java b/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
index 9a49237..830b49a 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
@@ -97,25 +97,43 @@ public class UntaggedWay extends Test {
                 }
 
                 if (!hasName && !isJunction) {
-                    errors.add(new TestError(this, Severity.WARNING, tr("Unnamed ways"), UNNAMED_WAY, w));
+                    errors.add(TestError.builder(this, Severity.WARNING, UNNAMED_WAY)
+                            .message(tr("Unnamed ways"))
+                            .primitives(w)
+                            .build());
                 } else if (isJunction) {
-                    errors.add(new TestError(this, Severity.OTHER, tr("Unnamed junction"), UNNAMED_JUNCTION, w));
+                    errors.add(TestError.builder(this, Severity.OTHER, UNNAMED_JUNCTION)
+                            .message(tr("Unnamed junction"))
+                            .primitives(w)
+                            .build());
                 }
             }
         }
 
         if (!w.isTagged() && !waysUsedInRelations.contains(w)) {
             if (w.hasKeys()) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Untagged ways (commented)"), COMMENTED_WAY, w));
+                errors.add(TestError.builder(this, Severity.WARNING, COMMENTED_WAY)
+                        .message(tr("Untagged ways (commented)"))
+                        .primitives(w)
+                        .build());
             } else {
-                errors.add(new TestError(this, Severity.WARNING, tr("Untagged ways"), UNTAGGED_WAY, w));
+                errors.add(TestError.builder(this, Severity.WARNING, UNTAGGED_WAY)
+                        .message(tr("Untagged ways"))
+                        .primitives(w)
+                        .build());
             }
         }
 
         if (w.getNodesCount() == 0) {
-            errors.add(new TestError(this, Severity.ERROR, tr("Empty ways"), EMPTY_WAY, w));
+            errors.add(TestError.builder(this, Severity.ERROR, EMPTY_WAY)
+                    .message(tr("Empty ways"))
+                    .primitives(w)
+                    .build());
         } else if (w.getNodesCount() == 1) {
-            errors.add(new TestError(this, Severity.ERROR, tr("One node ways"), ONE_NODE_WAY, w));
+            errors.add(TestError.builder(this, Severity.ERROR, ONE_NODE_WAY)
+                    .message(tr("One node ways"))
+                    .primitives(w)
+                    .build());
         }
     }
 
diff --git a/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java b/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
index 06869a1..d696d1a 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.data.validation.tests;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Arrays;
 import java.util.List;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -91,9 +90,10 @@ public class WayConnectedToArea extends Test {
         if (w.hasKey("highway") && wayNode.hasTag("leisure", "slipway") && area.hasTag("natural", "water")) {
             return;
         }
-        errors.add(new TestError(this, Severity.WARNING,
-                tr("Way terminates on Area"), 2301,
-                Arrays.asList(w, p),
-                Arrays.asList(wayNode)));
+        errors.add(TestError.builder(this, Severity.WARNING, 2301)
+                .message(tr("Way terminates on Area"))
+                .primitives(w, p)
+                .highlight(wayNode)
+                .build());
     }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java b/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java
index 047846d..3374fe6 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java
@@ -3,8 +3,6 @@ package org.openstreetmap.josm.data.validation.tests;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Collections;
-
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -50,6 +48,9 @@ public class WronglyOrderedWays extends Test {
     }
 
     private void reportError(Way w, String msg, int type) {
-        errors.add(new TestError(this, Severity.WARNING, msg, type, Collections.singletonList(w)));
+        errors.add(TestError.builder(this, Severity.WARNING, type)
+                .message(msg)
+                .primitives(w)
+                .build());
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
index dab0b0e..93ff71d 100644
--- a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
+++ b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
@@ -135,6 +135,24 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
         }
     }
 
+    /**
+     * Formats a name for an {@link OsmPrimitive}.
+     *
+     * @param osm the primitive
+     * @return the name
+     * @since 10991
+     */
+    public String format(OsmPrimitive osm) {
+        if (osm instanceof Node) {
+            return format((Node) osm);
+        } else if (osm instanceof Way) {
+            return format((Way) osm);
+        } else if (osm instanceof Relation) {
+            return format((Relation) osm);
+        }
+        return null;
+    }
+
     @Override
     public String format(Node node) {
         StringBuilder name = new StringBuilder();
diff --git a/src/org/openstreetmap/josm/gui/ExtendedDialog.java b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
index 602a9bc..b82297f 100644
--- a/src/org/openstreetmap/josm/gui/ExtendedDialog.java
+++ b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
@@ -107,7 +107,7 @@ public class ExtendedDialog extends JDialog {
 
     // For easy access when inherited
     protected transient Insets contentInsets = new Insets(10, 5, 0, 5);
-    protected List<JButton> buttons = new ArrayList<>();
+    protected transient List<JButton> buttons = new ArrayList<>();
 
     /**
      * This method sets up the most basic options for the dialog. Add more
diff --git a/src/org/openstreetmap/josm/gui/GettingStarted.java b/src/org/openstreetmap/josm/gui/GettingStarted.java
index f04b348..f284ec3 100644
--- a/src/org/openstreetmap/josm/gui/GettingStarted.java
+++ b/src/org/openstreetmap/josm/gui/GettingStarted.java
@@ -5,8 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
 import java.awt.EventQueue;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -16,14 +14,15 @@ import java.util.regex.Pattern;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.KeyStroke;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.datatransfer.OpenTransferHandler;
+import org.openstreetmap.josm.gui.dialogs.MenuItemSearchDialog;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferenceListener;
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
@@ -71,7 +70,7 @@ public final class GettingStarted extends JPanel implements ProxyPreferenceListe
     /**
      * Grabs current MOTD from cache or webpage and parses it.
      */
-    private static class MotdContent extends CacheCustomContent<IOException> {
+    static class MotdContent extends CacheCustomContent<IOException> {
         MotdContent() {
             super("motd.html", CacheCustomContent.INTERVAL_DAILY);
         }
@@ -122,8 +121,9 @@ public final class GettingStarted extends JPanel implements ProxyPreferenceListe
         super(new BorderLayout());
         lg = new LinkGeneral("<html>" + STYLE + "<h1>" + "JOSM - " + tr("Java OpenStreetMap Editor")
                 + "</h1><h2 align=\"center\">" + tr("Downloading \"Message of the day\"") + "</h2></html>");
-        // clear the build-in command ctrl+shift+O, because it is used as shortcut in JOSM
-        lg.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), "none");
+        // clear the build-in command ctrl+shift+O, ctrl+space because it is used as shortcut in JOSM
+        lg.getInputMap(JComponent.WHEN_FOCUSED).put(DownloadPrimitiveAction.SHORTCUT.getKeyStroke(), "none");
+        lg.getInputMap(JComponent.WHEN_FOCUSED).put(MenuItemSearchDialog.Action.SHORTCUT.getKeyStroke(), "none");
         lg.setTransferHandler(null);
 
         JScrollPane scroller = new JScrollPane(lg);
@@ -160,12 +160,12 @@ public final class GettingStarted extends JPanel implements ProxyPreferenceListe
         t.start();
     }
 
-    private String fixImageLinks(String s) {
-        Matcher m = Pattern.compile("src=\""+Main.getJOSMWebsite()+"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s);
+    static String fixImageLinks(String s) {
+        Matcher m = Pattern.compile("src=\"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s);
         StringBuffer sb = new StringBuffer();
         while (m.find()) {
             String im = m.group(1);
-            URL u = getClass().getResource(im);
+            URL u = GettingStarted.class.getResource(im);
             if (u != null) {
                 m.appendReplacement(sb, Matcher.quoteReplacement("src=\"" + u + '\"'));
             }
diff --git a/src/org/openstreetmap/josm/gui/ImageryMenu.java b/src/org/openstreetmap/josm/gui/ImageryMenu.java
index a2cc270..557abad 100644
--- a/src/org/openstreetmap/josm/gui/ImageryMenu.java
+++ b/src/org/openstreetmap/josm/gui/ImageryMenu.java
@@ -84,7 +84,7 @@ public class ImageryMenu extends JMenu implements LayerChangeListener {
                 }
                 return;
             }
-            if (source == null) return;
+            if (source == null || !source.isShowing()) return;
             for (ImageryLayer layer : layers) {
                 JMenuItem layerMenu = layer.getOffsetMenuItem();
                 layerMenu.setText(layer.getName());
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index 8388440..4af8300 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -112,7 +112,9 @@ public class MainApplication extends Main {
 
     @Override
     protected void shutdown() {
-        mainFrame.storeState();
+        if (mainFrame != null) {
+            mainFrame.storeState();
+        }
         super.shutdown();
     }
 
@@ -122,7 +124,11 @@ public class MainApplication extends Main {
      */
     public static void showHelp() {
         // TODO: put in a platformHook for system that have no console by default
-        System.out.println(tr("Java OpenStreetMap Editor")+" ["
+        System.out.println(getHelp());
+    }
+
+    static String getHelp() {
+        return tr("Java OpenStreetMap Editor")+" ["
                 +Version.getInstance().getAgentString()+"]\n\n"+
                 tr("usage")+":\n"+
                 "\tjava -jar josm.jar <options>...\n\n"+
@@ -156,17 +162,16 @@ public class MainApplication extends Main {
                 tr("note: For some tasks, JOSM needs a lot of memory. It can be necessary to add the following\n" +
                         "      Java option to specify the maximum size of allocated memory in megabytes")+":\n"+
                         "\t-Xmx...m\n\n"+
-                        tr("examples")+":\n"+
-                        "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"+
-                        "\tjava -jar josm.jar "+OsmUrlToBounds.getURL(43.2, 11.1, 13)+'\n'+
-                        "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+
-                        "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"+
-                        "\tjava -Djosm.pref=$XDG_CONFIG_HOME -Djosm.userdata=$XDG_DATA_HOME -Djosm.cache=$XDG_CACHE_HOME -jar josm.jar\n"+
-                        "\tjava -Djosm.home=/home/user/.josm_dev -jar josm.jar\n"+
-                        "\tjava -Xmx1024m -jar josm.jar\n\n"+
-                        tr("Parameters --download, --downloadgps, and --selection are processed in this order.")+'\n'+
-                        tr("Make sure you load some data if you use --selection.")+'\n'
-                );
+                tr("examples")+":\n"+
+                "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"+
+                "\tjava -jar josm.jar "+OsmUrlToBounds.getURL(43.2, 11.1, 13)+'\n'+
+                "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+
+                "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"+
+                "\tjava -Djosm.pref=$XDG_CONFIG_HOME -Djosm.userdata=$XDG_DATA_HOME -Djosm.cache=$XDG_CACHE_HOME -jar josm.jar\n"+
+                "\tjava -Djosm.home=/home/user/.josm_dev -jar josm.jar\n"+
+                "\tjava -Xmx1024m -jar josm.jar\n\n"+
+                tr("Parameters --download, --downloadgps, and --selection are processed in this order.")+'\n'+
+                tr("Make sure you load some data if you use --selection.")+'\n';
     }
 
     /**
@@ -181,13 +186,16 @@ public class MainApplication extends Main {
         try {
             args = new ProgramArguments(argArray);
         } catch (IllegalArgumentException e) {
+            System.err.println(e.getMessage());
             System.exit(1);
             return;
         }
 
         Level logLevel = args.getLogLevel();
         Logging.setLogLevel(logLevel);
-        Main.info(tr("Log level is at {0} ({1}, {2})", logLevel.getLocalizedName(), logLevel.getName(), logLevel.intValue()));
+        if (!args.showVersion() && !args.showHelp()) {
+            Main.info(tr("Log level is at {0} ({1}, {2})", logLevel.getLocalizedName(), logLevel.getName(), logLevel.intValue()));
+        }
 
         Optional<String> language = args.getSingle(Option.LANGUAGE);
         I18n.set(language.orElse(null));
@@ -214,16 +222,16 @@ public class MainApplication extends Main {
         // call the really early hook before we do anything else
         Main.platform.preStartupHook();
 
-        Main.COMMAND_LINE_ARGS.addAll(Arrays.asList(argArray));
-
         if (args.showVersion()) {
             System.out.println(Version.getInstance().getAgentString());
-            System.exit(0);
+            return;
         } else if (args.showHelp()) {
             showHelp();
-            System.exit(0);
+            return;
         }
 
+        Main.COMMAND_LINE_ARGS.addAll(Arrays.asList(argArray));
+
         boolean skipLoadingPlugins = args.hasOption(Option.SKIP_PLUGINS);
         if (skipLoadingPlugins) {
             Main.info(tr("Plugin loading skipped"));
@@ -246,12 +254,6 @@ public class MainApplication extends Main {
 
         checkIPv6();
 
-        // asking for help? show help and exit
-        if (args.hasOption(Option.HELP)) {
-            showHelp();
-            System.exit(0);
-        }
-
         processOffline(args);
 
         Main.platform.afterPrefStartupHook();
diff --git a/src/org/openstreetmap/josm/gui/MainFrame.java b/src/org/openstreetmap/josm/gui/MainFrame.java
index 9b7e351..1c620de 100644
--- a/src/org/openstreetmap/josm/gui/MainFrame.java
+++ b/src/org/openstreetmap/josm/gui/MainFrame.java
@@ -91,7 +91,7 @@ public class MainFrame extends JFrame {
         addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosing(final WindowEvent evt) {
-                Main.exitJosm(true, 0);
+                Main.exitJosm(true, 0, null);
             }
         });
         setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
diff --git a/src/org/openstreetmap/josm/gui/MainPanel.java b/src/org/openstreetmap/josm/gui/MainPanel.java
index 2798eb7..5954142 100644
--- a/src/org/openstreetmap/josm/gui/MainPanel.java
+++ b/src/org/openstreetmap/josm/gui/MainPanel.java
@@ -75,9 +75,7 @@ public class MainPanel extends JPanel {
 
         // Notify map frame listeners, mostly plugins.
         for (MapFrameListener listener : mapFrameListeners) {
-            MapView.fireDeprecatedListenerOnAdd = true;
             listener.mapFrameInitialized(old, map);
-            MapView.fireDeprecatedListenerOnAdd = false;
         }
         if (map == null && Main.currentProgressMonitor != null) {
             Main.currentProgressMonitor.showForegroundDialog();
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index 9a12018..83b1e4a 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -283,7 +283,7 @@ public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeLi
         Main.getLayerManager().addLayerChangeListener(this);
         Main.getLayerManager().addActiveLayerChangeListener(this);
 
-        boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0) != null;
+        boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0).isPresent();
         if (unregisterTab) {
             for (JComponent c: allDialogButtons) {
                 c.setFocusTraversalKeysEnabled(false);
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index d59d8fe..d5665be 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -220,7 +220,7 @@ public final class MapStatus extends JPanel implements Helpful, Destroyable, Pre
 
     private final transient List<StatusTextHistory> statusText = new ArrayList<>();
 
-    private static class StatusTextHistory {
+    protected static final class StatusTextHistory {
         private final Object id;
         private final String text;
 
diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index 8dcb0f7..a811296 100644
--- a/src/org/openstreetmap/josm/gui/MapView.java
+++ b/src/org/openstreetmap/josm/gui/MapView.java
@@ -1,8 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -22,7 +20,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.IdentityHashMap;
@@ -31,6 +28,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
@@ -62,7 +60,6 @@ import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
-import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.layer.MapViewGraphics;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable.LayerPainter;
@@ -92,53 +89,6 @@ import org.openstreetmap.josm.tools.bugreport.BugReport;
 public class MapView extends NavigatableComponent
 implements PropertyChangeListener, PreferenceChangedListener,
 LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
-    /**
-     * Interface to notify listeners of a layer change.
-     * <p>
-     * To be removed: end of 2016.
-     * @deprecated Use {@link org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener} instead.
-     * @author imi
-     */
-    @Deprecated
-    public interface LayerChangeListener {
-
-        /**
-         * Notifies this listener that the active layer has changed.
-         * @param oldLayer The previous active layer
-         * @param newLayer The new activer layer
-         */
-        void activeLayerChange(Layer oldLayer, Layer newLayer);
-
-        /**
-         * Notifies this listener that a layer has been added.
-         * @param newLayer The new added layer
-         */
-        void layerAdded(Layer newLayer);
-
-        /**
-         * Notifies this listener that a layer has been removed.
-         * @param oldLayer The old removed layer
-         */
-        void layerRemoved(Layer oldLayer);
-    }
-
-    /**
-     * An interface that needs to be implemented in order to listen for changes to the active edit layer.
-     * <p>
-     * To be removed: end of 2016.
-     * @deprecated Use {@link ActiveLayerChangeListener} instead.
-     */
-    @Deprecated
-    @FunctionalInterface
-    public interface EditLayerChangeListener {
-
-        /**
-         * Called after the active edit layer was changed.
-         * @param oldLayer The old edit layer
-         * @param newLayer The current (new) edit layer
-         */
-        void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer);
-    }
 
     /**
      * An invalidation listener that simply calls repaint() for now.
@@ -210,138 +160,6 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
     }
 
     /**
-     * This class is an adapter for the old layer change interface.
-     * @author Michael Zangl
-     * @since 10271
-     * @deprecated New implementations should use {@link org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener}
-     */
-    @Deprecated
-    protected static class LayerChangeAdapter implements ActiveLayerChangeListener, LayerManager.LayerChangeListener {
-
-        private final LayerChangeListener wrapped;
-        private boolean receiveOneInitialFire;
-
-        public LayerChangeAdapter(LayerChangeListener wrapped) {
-            this.wrapped = wrapped;
-        }
-
-        public LayerChangeAdapter(LayerChangeListener wrapped, boolean initialFire) {
-            this(wrapped);
-            this.receiveOneInitialFire = initialFire;
-        }
-
-        @Override
-        public void layerAdded(LayerAddEvent e) {
-            wrapped.layerAdded(e.getAddedLayer());
-        }
-
-        @Override
-        public void layerRemoving(LayerRemoveEvent e) {
-            wrapped.layerRemoved(e.getRemovedLayer());
-        }
-
-        @Override
-        public void layerOrderChanged(LayerOrderChangeEvent e) {
-            // not in old API
-        }
-
-        @Override
-        public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-            Layer oldActive = receiveOneInitialFire ? null : e.getPreviousActiveLayer();
-            Layer newActive = e.getSource().getActiveLayer();
-            if (oldActive != newActive) {
-                wrapped.activeLayerChange(oldActive, newActive);
-            }
-            receiveOneInitialFire = false;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((wrapped == null) ? 0 : wrapped.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            LayerChangeAdapter other = (LayerChangeAdapter) obj;
-            if (wrapped == null) {
-                if (other.wrapped != null)
-                    return false;
-            } else if (!wrapped.equals(other.wrapped))
-                return false;
-            return true;
-        }
-
-        @Override
-        public String toString() {
-            return "LayerChangeAdapter [wrapped=" + wrapped + ']';
-        }
-    }
-
-    /**
-     * This class is an adapter for the old layer change interface.
-     * @author Michael Zangl
-     * @since 10271
-     * @deprecated New implementations should use {@link org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener}
-     */
-    @Deprecated
-    protected static class EditLayerChangeAdapter implements ActiveLayerChangeListener {
-
-        private final EditLayerChangeListener wrapped;
-
-        public EditLayerChangeAdapter(EditLayerChangeListener wrapped) {
-            this.wrapped = wrapped;
-        }
-
-        @Override
-        public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-            OsmDataLayer oldLayer = e.getPreviousEditLayer();
-            OsmDataLayer newLayer = e.getSource().getEditLayer();
-            if (oldLayer != newLayer) {
-                wrapped.editLayerChanged(oldLayer, newLayer);
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((wrapped == null) ? 0 : wrapped.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            EditLayerChangeAdapter other = (EditLayerChangeAdapter) obj;
-            if (wrapped == null) {
-                if (other.wrapped != null)
-                    return false;
-            } else if (!wrapped.equals(other.wrapped))
-                return false;
-            return true;
-        }
-
-        @Override
-        public String toString() {
-            return "EditLayerChangeAdapter [wrapped=" + wrapped + ']';
-        }
-    }
-
-    /**
      * A layer painter that issues a warning when being called.
      * @author Michael Zangl
      * @since 10474
@@ -368,137 +186,6 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         }
     }
 
-    /**
-     * Removes a layer change listener
-     * <p>
-     * To be removed: end of 2016.
-     *
-     * @param listener the listener. Ignored if null or not registered.
-     * @deprecated You should register the listener on {@link Main#getLayerManager()} instead.
-     */
-    @Deprecated
-    public static void removeLayerChangeListener(LayerChangeListener listener) {
-        LayerChangeAdapter adapter = new LayerChangeAdapter(listener);
-        try {
-            Main.getLayerManager().removeLayerChangeListener(adapter);
-        } catch (IllegalArgumentException e) {
-            // Ignored in old implementation
-            Main.debug(e);
-        }
-        try {
-            Main.getLayerManager().removeActiveLayerChangeListener(adapter);
-        } catch (IllegalArgumentException e) {
-            // Ignored in old implementation
-            Main.debug(e);
-        }
-    }
-
-    /**
-     * Removes an edit layer change listener
-     * <p>
-     * To be removed: end of 2016.
-     *
-     * @param listener the listener. Ignored if null or not registered.
-     * @deprecated You should register the listener on {@link Main#getLayerManager()} instead.
-     */
-    @Deprecated
-    public static void removeEditLayerChangeListener(EditLayerChangeListener listener) {
-        try {
-            Main.getLayerManager().removeActiveLayerChangeListener(new EditLayerChangeAdapter(listener));
-        } catch (IllegalArgumentException e) {
-            // Ignored in old implementation
-            Main.debug(e);
-        }
-    }
-
-    /**
-     * Adds a layer change listener
-     * <p>
-     * To be removed: end of 2016.
-     *
-     * @param listener the listener. Ignored if null or already registered.
-     * @deprecated You should register the listener on {@link Main#getLayerManager()} instead.
-     */
-    @Deprecated
-    public static void addLayerChangeListener(LayerChangeListener listener) {
-        if (fireDeprecatedListenerOnAdd) {
-            Main.warn("Plugin seems to be adding listener during mapFrameInitialized(): " + BugReport.getCallingMethod(2)
-            + ". Layer listeners should be set on plugin load.");
-        }
-        addLayerChangeListener(listener, fireDeprecatedListenerOnAdd);
-    }
-
-    /**
-     * Adds a layer change listener
-     * <p>
-     * To be removed: end of 2016.
-     *
-     * @param listener the listener. Ignored if null or already registered.
-     * @param initialFire fire an active-layer-changed-event right after adding
-     * the listener in case there is a layer present (should be)
-     * @deprecated You should register the listener on {@link Main#getLayerManager()} instead.
-     */
-    @Deprecated
-    public static void addLayerChangeListener(LayerChangeListener listener, boolean initialFire) {
-        if (listener != null) {
-            boolean doInitialFire = initialFire && (Main.isDisplayingMapView() || fireDeprecatedListenerOnAdd);
-
-            LayerChangeAdapter adapter = new LayerChangeAdapter(listener, doInitialFire);
-            Main.getLayerManager().addLayerChangeListener(adapter, doInitialFire);
-            if (doInitialFire) {
-                Main.getLayerManager().addAndFireActiveLayerChangeListener(adapter);
-            } else {
-                Main.getLayerManager().addActiveLayerChangeListener(adapter);
-            }
-            adapter.receiveOneInitialFire = false;
-        }
-    }
-
-    /**
-     * Adds an edit layer change listener
-     * <p>
-     * To be removed: end of 2016.
-     *
-     * @param listener the listener. Ignored if null or already registered.
-     * @param initialFire fire an edit-layer-changed-event right after adding
-     * the listener in case there is an edit layer present
-     * @deprecated You should register the listener on {@link Main#getLayerManager()} instead.
-     */
-    @Deprecated
-    public static void addEditLayerChangeListener(EditLayerChangeListener listener, boolean initialFire) {
-        if (listener != null) {
-            boolean doFire = initialFire && Main.isDisplayingMapView() && Main.getLayerManager().getEditLayer() != null;
-            if (doFire) {
-                Main.getLayerManager().addAndFireActiveLayerChangeListener(new EditLayerChangeAdapter(listener));
-            } else {
-                Main.getLayerManager().addActiveLayerChangeListener(new EditLayerChangeAdapter(listener));
-            }
-        }
-    }
-
-    /**
-     * Adds an edit layer change listener
-     * <p>
-     * To be removed: end of 2016.
-     *
-     * @param listener the listener. Ignored if null or already registered.
-     * @deprecated You should register the listener on {@link Main#getLayerManager()} instead.
-     */
-    @Deprecated
-    public static void addEditLayerChangeListener(EditLayerChangeListener listener) {
-        addEditLayerChangeListener(listener, false);
-    }
-
-
-    /**
-     * Temporary. To be removed as soon as the {@link LayerChangeListener}s are removed.
-     * <p>
-     * Some plugins add their listeners in {@link Main#setMapFrame(MapFrame)}. This method is now called just after the first layer was added to
-     * the layer manager. So that listener would not receive the addition of the first layer. As long as this field is set, we fake an add call
-     * to that listener when it is added to immitate the old behaviour. You should not access it from anywhere else.
-     */
-    public static boolean fireDeprecatedListenerOnAdd;
-
     public boolean viewportFollowing;
 
     /**
@@ -528,7 +215,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
     // Layers that wasn't changed since last paint
     private final transient List<Layer> nonChangedLayers = new ArrayList<>();
     private int lastViewID;
-    private boolean paintPreferencesChanged = true;
+    private final AtomicBoolean paintPreferencesChanged = new AtomicBoolean(true);
     private Rectangle lastClipBounds = new Rectangle();
     private transient MapMover mapMover;
 
@@ -589,9 +276,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
             }
         });
 
-        if (Shortcut.findShortcut(KeyEvent.VK_TAB, 0) != null) {
-            setFocusTraversalKeysEnabled(false);
-        }
+        setFocusTraversalKeysEnabled(!Shortcut.findShortcut(KeyEvent.VK_TAB, 0).isPresent());
 
         for (JComponent c : getMapNavigationComponents(this)) {
             add(c);
@@ -609,7 +294,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         Dimension size = zoomSlider.getPreferredSize();
         zoomSlider.setSize(size);
         zoomSlider.setLocation(3, 0);
-        zoomSlider.setFocusTraversalKeysEnabled(Shortcut.findShortcut(KeyEvent.VK_TAB, 0) == null);
+        zoomSlider.setFocusTraversalKeysEnabled(!Shortcut.findShortcut(KeyEvent.VK_TAB, 0).isPresent());
 
         MapScaler scaler = new MapScaler(forMapView);
         scaler.setPreferredLineLength(size.width - 10);
@@ -631,18 +316,6 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         oldLoc = getLocationOnScreen();
     }
 
-    /**
-     * Add a layer to the current MapView.
-     * <p>
-     * To be removed: end of 2016.
-     * @param layer The layer to add
-     * @deprecated Use {@link Main#getLayerManager()}.addLayer() instead.
-     */
-    @Deprecated
-    public void addLayer(Layer layer) {
-        layerManager.addLayer(layer);
-    }
-
     @Override
     public void layerAdded(LayerAddEvent e) {
         try {
@@ -674,16 +347,6 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
     }
 
     /**
-     * Returns current data set. To be removed: end of 2016.
-     * @deprecated Use {@link #getLayerManager()}.getEditDataSet() instead.
-     */
-    @Override
-    @Deprecated
-    protected DataSet getCurrentDataSet() {
-        return layerManager.getEditDataSet();
-    }
-
-    /**
      * Replies true if the active data layer (edit layer) is drawable.
      *
      * @return true if the active data layer (edit layer) is drawable, false otherwise
@@ -702,48 +365,6 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         return e != null && e.isVisible();
     }
 
-    /**
-     * Determines the next active data layer according to the following rules:
-     * <ul>
-     *   <li>if there is at least one {@link OsmDataLayer} the first one
-     *     becomes active</li>
-     *   <li>otherwise, the top most layer of any type becomes active</li>
-     * </ul>
-     * To be removed: end of 2016.
-     * @param layersList lit of layers
-     *
-     * @return the next active data layer
-     * @deprecated now handled by {@link MainLayerManager}
-     */
-    @Deprecated
-    protected Layer determineNextActiveLayer(List<Layer> layersList) {
-        // First look for data layer
-        for (Layer layer:layersList) {
-            if (layer instanceof OsmDataLayer)
-                return layer;
-        }
-
-        // Then any layer
-        if (!layersList.isEmpty())
-            return layersList.get(0);
-
-        // and then give up
-        return null;
-    }
-
-    /**
-     * Remove the layer from the mapview. If the layer was in the list before,
-     * an LayerChange event is fired.
-     * <p>
-     * To be removed: end of 2016.
-     * @param layer The layer to remove
-     * @deprecated Use {@link Main#getLayerManager()}.removeLayer() instead.
-     */
-    @Deprecated
-    public void removeLayer(Layer layer) {
-        layerManager.removeLayer(layer);
-    }
-
     @Override
     public void layerRemoving(LayerRemoveEvent e) {
         Layer layer = e.getRemovedLayer();
@@ -798,40 +419,6 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         repaint();
     }
 
-    /**
-     * Gets the index of the layer in the layer list.
-     * <p>
-     * To be removed: end of 2016.
-     * @param layer The layer to search for.
-     * @return The index in the list.
-     * @throws IllegalArgumentException if that layer does not belong to this view.
-     * @deprecated Access the layer list using {@link Main#getLayerManager()} instead.
-     */
-    @Deprecated
-    public int getLayerPos(Layer layer) {
-        int curLayerPos = layerManager.getLayers().indexOf(layer);
-        if (curLayerPos == -1)
-            throw new IllegalArgumentException(tr("Layer not in list."));
-        return curLayerPos;
-    }
-
-    /**
-     * Creates a list of the visible layers in Z-Order, the layer with the lowest Z-Order
-     * first, layer with the highest Z-Order last.
-     * <p>
-     * The active data layer is pulled above all adjacent data layers.
-     * <p>
-     * To be removed: end of 2016.
-     *
-     * @return a list of the visible in Z-Order, the layer with the lowest Z-Order
-     * first, layer with the highest Z-Order last.
-     * @deprecated Access the layer list using {@link Main#getLayerManager()} instead.
-     */
-    @Deprecated
-    public List<Layer> getVisibleLayersInZOrder() {
-        return layerManager.getVisibleLayersInZOrder();
-    }
-
     private void paintLayer(Layer layer, Graphics2D g, Bounds box) {
         try {
             LayerPainter painter = registeredLayers.get(layer);
@@ -870,6 +457,9 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         int nonChangedLayersCount = 0;
         Set<MapViewPaintable> invalidated = invalidatedListener.collectInvalidatedLayers();
         for (Layer l: visibleLayers) {
+            // `isChanged` for backward compatibility, see https://josm.openstreetmap.de/ticket/13175#comment:7
+            // Layers that still implement it (plugins) will use it to tell the MapView that they have been changed.
+            // This is why the MapView still uses it in addition to the invalidation events.
             if (l.isChanged() || invalidated.contains(l)) {
                 break;
             } else {
@@ -877,22 +467,11 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
             }
         }
 
-        boolean canUseBuffer;
-
-        synchronized (this) {
-            canUseBuffer = !paintPreferencesChanged;
-            paintPreferencesChanged = false;
-        }
-        canUseBuffer = canUseBuffer && nonChangedLayers.size() <= nonChangedLayersCount &&
-        lastViewID == getViewID() && lastClipBounds.contains(g.getClipBounds());
-        if (canUseBuffer) {
-            for (int i = 0; i < nonChangedLayers.size(); i++) {
-                if (visibleLayers.get(i) != nonChangedLayers.get(i)) {
-                    canUseBuffer = false;
-                    break;
-                }
-            }
-        }
+        boolean canUseBuffer = !paintPreferencesChanged.getAndSet(false)
+                && nonChangedLayers.size() <= nonChangedLayersCount
+                && lastViewID == getViewID()
+                && lastClipBounds.contains(g.getClipBounds())
+                && nonChangedLayers.equals(visibleLayers.subList(0, nonChangedLayers.size()));
 
         if (null == offscreenBuffer || offscreenBuffer.getWidth() != getWidth() || offscreenBuffer.getHeight() != getHeight()) {
             offscreenBuffer = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_3BYTE_BGR);
@@ -927,9 +506,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         }
 
         nonChangedLayers.clear();
-        for (int i = 0; i < nonChangedLayersCount; i++) {
-            nonChangedLayers.add(visibleLayers.get(i));
-        }
+        nonChangedLayers.addAll(visibleLayers.subList(0, nonChangedLayersCount));
         lastViewID = getViewID();
         lastClipBounds = g.getClipBounds();
 
@@ -1048,97 +625,6 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         return true;
     }
 
-    /**
-     * Returns all layers. To be removed: end of 2016.
-     *
-     * @return An unmodifiable collection of all layers
-     * @deprecated Use {@link LayerManager#getLayers()} instead.
-     */
-    @Deprecated
-    public Collection<Layer> getAllLayers() {
-        return layerManager.getLayers();
-    }
-
-    /**
-     * Returns all layers as list. To be removed: end of 2016.
-     *
-     * @return An unmodifiable ordered list of all layers
-     * @deprecated Use {@link LayerManager#getLayers()} instead.
-     */
-    @Deprecated
-    public List<Layer> getAllLayersAsList() {
-        return layerManager.getLayers();
-    }
-
-    /**
-     * Replies an unmodifiable list of layers of a certain type. To be removed: end of 2016.
-     *
-     * Example:
-     * <pre>
-     *     List<WMSLayer> wmsLayers = getLayersOfType(WMSLayer.class);
-     * </pre>
-     *
-     * @param <T> layer type
-     *
-     * @param ofType The layer type.
-     * @return an unmodifiable list of layers of a certain type.
-     * @deprecated Use {@link LayerManager#getLayersOfType(Class)} instead.
-     */
-    @Deprecated
-    public <T extends Layer> List<T> getLayersOfType(Class<T> ofType) {
-        return layerManager.getLayersOfType(ofType);
-    }
-
-    /**
-     * Replies the number of layers managed by this map view. To be removed: end of 2016.
-     * <p>
-     *
-     * @return the number of layers managed by this map view
-     * @deprecated Use {@link Main#getLayerManager()}.getLayers().size() instead.
-     */
-    @Deprecated
-    public int getNumLayers() {
-        return getAllLayers().size();
-    }
-
-    /**
-     * Replies true if there is at least one layer in this map view
-     * <p>
-     *
-     * @return true if there is at least one layer in this map view
-     * @deprecated Use !{@link Main#getLayerManager()}.getLayers().isEmpty() instead.
-     */
-    @Deprecated
-    public boolean hasLayers() {
-        return getNumLayers() > 0;
-    }
-
-    /**
-     * Sets the active layer to <code>layer</code>. If <code>layer</code> is an instance
-     * of {@link OsmDataLayer} also sets editLayer to <code>layer</code>.
-     * <p>
-     *
-     * @param layer the layer to be activate; must be one of the layers in the list of layers
-     * @throws IllegalArgumentException if layer is not in the list of layers
-     * @deprecated Use !{@link Main#getLayerManager()}.setActiveLayer() instead.
-     */
-    @Deprecated
-    public void setActiveLayer(Layer layer) {
-        layerManager.setActiveLayer(layer);
-    }
-
-    /**
-     * Replies the currently active layer
-     * <p>
-     *
-     * @return the currently active layer (may be null)
-     * @deprecated Use !{@link Main#getLayerManager()}.getActiveLayer() instead.
-     */
-    @Deprecated
-    public Layer getActiveLayer() {
-        return layerManager.getActiveLayer();
-    }
-
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
         if (Main.map != null) {
@@ -1163,31 +649,6 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
     }
 
     /**
-     * Replies the current edit layer, if any
-     * <p>
-     *
-     * @return the current edit layer. May be null.
-     * @deprecated Use !{@link Main#getLayerManager()}.getEditLayer() instead. To be made private: end of 2016.
-     */
-    @Deprecated
-    public OsmDataLayer getEditLayer() {
-        return layerManager.getEditLayer();
-    }
-
-    /**
-     * replies true if the list of layers managed by this map view contain layer
-     * <p>
-     *
-     * @param layer the layer
-     * @return true if the list of layers managed by this map view contain layer
-     * @deprecated Use !{@link Main#getLayerManager()}.containsLayer() instead.
-     */
-    @Deprecated
-    public boolean hasLayer(Layer layer) {
-        return layerManager.containsLayer(layer);
-    }
-
-    /**
      * Adds a new temporary layer.
      * <p>
      * A temporary layer is a layer that is painted above all normal layers. Layers are painted in the order they are added.
@@ -1243,23 +704,9 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         }
     }
 
-    /**
-     * Sets the title of the JOSM main window, adding a star if there are dirty layers.
-     * @see Main#parent
-     * @deprecated Replaced by {@link MainFrame#refreshTitle()}. The {@link MainFrame} should handle this by itself.
-     */
-    @Deprecated
-    protected void refreshTitle() {
-        if (Main.parent != null) {
-            ((MainFrame) Main.parent).refreshTitle();
-        }
-    }
-
     @Override
     public void preferenceChanged(PreferenceChangeEvent e) {
-        synchronized (this) {
-            paintPreferencesChanged = true;
-        }
+        paintPreferencesChanged.set(true);
     }
 
     private final transient SelectionChangedListener repaintSelectionChangedListener = newSelection -> repaint();
diff --git a/src/org/openstreetmap/josm/gui/MapViewState.java b/src/org/openstreetmap/josm/gui/MapViewState.java
index d38365a..67d06a6 100644
--- a/src/org/openstreetmap/josm/gui/MapViewState.java
+++ b/src/org/openstreetmap/josm/gui/MapViewState.java
@@ -10,6 +10,7 @@ import java.awt.geom.Point2D;
 import java.awt.geom.Point2D.Double;
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
+import java.util.Objects;
 
 import javax.swing.JComponent;
 
@@ -22,6 +23,8 @@ import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
@@ -57,6 +60,11 @@ public final class MapViewState implements Serializable {
      */
     public static final int OUTSIDE_RIGHT = 8;
 
+    /**
+     * Additional pixels outside the view for where to start clipping.
+     */
+    private static final int CLIP_BOUNDS = 50;
+
     private final transient Projecting projecting;
 
     private final int viewWidth;
@@ -79,73 +87,67 @@ public final class MapViewState implements Serializable {
      * @param viewHeight The view height
      * @param scale The scale to use
      * @param topLeft The top left corner in east/north space.
+     * @param topLeftInWindow The top left point in window
+     * @param topLeftOnScreen The top left point on screen
      */
-    private MapViewState(Projecting projection, int viewWidth, int viewHeight, double scale, EastNorth topLeft) {
+    private MapViewState(Projecting projection, int viewWidth, int viewHeight, double scale, EastNorth topLeft,
+            Point topLeftInWindow, Point topLeftOnScreen) {
+        CheckParameterUtil.ensureParameterNotNull(projection, "projection");
+        CheckParameterUtil.ensureParameterNotNull(topLeft, "topLeft");
+        CheckParameterUtil.ensureParameterNotNull(topLeftInWindow, "topLeftInWindow");
+        CheckParameterUtil.ensureParameterNotNull(topLeftOnScreen, "topLeftOnScreen");
+
         this.projecting = projection;
         this.scale = scale;
         this.topLeft = topLeft;
 
         this.viewWidth = viewWidth;
         this.viewHeight = viewHeight;
-        topLeftInWindow = new Point(0, 0);
-        topLeftOnScreen = new Point(0, 0);
+        this.topLeftInWindow = topLeftInWindow;
+        this.topLeftOnScreen = topLeftOnScreen;
     }
 
-    private MapViewState(EastNorth topLeft, MapViewState mapViewState) {
-        this.projecting = mapViewState.projecting;
-        this.scale = mapViewState.scale;
-        this.topLeft = topLeft;
+    private MapViewState(Projecting projection, int viewWidth, int viewHeight, double scale, EastNorth topLeft) {
+        this(projection, viewWidth, viewHeight, scale, topLeft, new Point(0, 0), new Point(0, 0));
+    }
 
-        viewWidth = mapViewState.viewWidth;
-        viewHeight = mapViewState.viewHeight;
-        topLeftInWindow = mapViewState.topLeftInWindow;
-        topLeftOnScreen = mapViewState.topLeftOnScreen;
+    private MapViewState(EastNorth topLeft, MapViewState mvs) {
+        this(mvs.projecting, mvs.viewWidth, mvs.viewHeight, mvs.scale, topLeft, mvs.topLeftInWindow, mvs.topLeftOnScreen);
     }
 
-    private MapViewState(double scale, MapViewState mapViewState) {
-        this.projecting = mapViewState.projecting;
-        this.scale = scale;
-        this.topLeft = mapViewState.topLeft;
+    private MapViewState(double scale, MapViewState mvs) {
+        this(mvs.projecting, mvs.viewWidth, mvs.viewHeight, scale, mvs.topLeft, mvs.topLeftInWindow, mvs.topLeftOnScreen);
+    }
 
-        viewWidth = mapViewState.viewWidth;
-        viewHeight = mapViewState.viewHeight;
-        topLeftInWindow = mapViewState.topLeftInWindow;
-        topLeftOnScreen = mapViewState.topLeftOnScreen;
+    private MapViewState(JComponent position, MapViewState mvs) {
+        this(mvs.projecting, position.getWidth(), position.getHeight(), mvs.scale, mvs.topLeft,
+                findTopLeftInWindow(position), findTopLeftOnScreen(position));
     }
 
-    private MapViewState(JComponent position, MapViewState mapViewState) {
-        this.projecting = mapViewState.projecting;
-        this.scale = mapViewState.scale;
-        this.topLeft = mapViewState.topLeft;
+    private MapViewState(Projecting projecting, MapViewState mvs) {
+        this(projecting, mvs.viewWidth, mvs.viewHeight, mvs.scale, mvs.topLeft, mvs.topLeftInWindow, mvs.topLeftOnScreen);
+    }
 
-        viewWidth = position.getWidth();
-        viewHeight = position.getHeight();
-        topLeftInWindow = new Point();
-        // better than using swing utils, since this allows us to use the mehtod if no screen is present.
+    private static Point findTopLeftInWindow(JComponent position) {
+        Point result = new Point();
+        // better than using swing utils, since this allows us to use the method if no screen is present.
         Container component = position;
         while (component != null) {
-            topLeftInWindow.x += component.getX();
-            topLeftInWindow.y += component.getY();
+            result.x += component.getX();
+            result.y += component.getY();
             component = component.getParent();
         }
+        return result;
+    }
+
+    private static Point findTopLeftOnScreen(JComponent position) {
         try {
-            topLeftOnScreen = position.getLocationOnScreen();
+            return position.getLocationOnScreen();
         } catch (RuntimeException e) {
             throw BugReport.intercept(e).put("position", position).put("parent", position::getParent);
         }
     }
 
-    private MapViewState(Projecting projecting, MapViewState mapViewState) {
-        this.projecting = projecting;
-        this.scale = mapViewState.scale;
-        this.topLeft = mapViewState.topLeft;
-
-        viewWidth = mapViewState.viewWidth;
-        viewHeight = mapViewState.viewHeight;
-        topLeftInWindow = mapViewState.topLeftInWindow;
-        topLeftOnScreen = mapViewState.topLeftOnScreen;
-    }
-
     /**
      * The scale in east/north units per pixel.
      * @return The scale.
@@ -191,7 +193,11 @@ public final class MapViewState implements Serializable {
      * @since 10827
      */
     public MapViewPoint getPointFor(Node node) {
-        return getPointFor(node.getEastNorth(getProjection()));
+        try {
+            return getPointFor(node.getEastNorth(getProjection()));
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("node", node);
+        }
     }
 
     /**
@@ -264,6 +270,14 @@ public final class MapViewState implements Serializable {
     }
 
     /**
+     * Gets a rectangle that is several pixel bigger than the view. It is used to define the view clipping.
+     * @return The rectangle.
+     */
+    public MapViewRectangle getViewClipRectangle() {
+        return getForView(-CLIP_BOUNDS, -CLIP_BOUNDS).rectTo(getForView(getViewWidth() + CLIP_BOUNDS, getViewHeight() + CLIP_BOUNDS));
+    }
+
+    /**
      * Returns the area for the given bounds.
      * @param bounds bounds
      * @return the area for the given bounds
@@ -538,7 +552,7 @@ public final class MapViewState implements Serializable {
          * @return The new point
          * @since 10874
          */
-        public MapViewPoint interpolate(MapViewPoint p1, int i) {
+        public MapViewPoint interpolate(MapViewPoint p1, double i) {
             return new MapViewViewPoint((1 - i) * getInViewX() + i * p1.getInViewX(), (1 - i) * getInViewY() + i * p1.getInViewY());
         }
     }
@@ -573,7 +587,7 @@ public final class MapViewState implements Serializable {
         private final EastNorth eastNorth;
 
         MapViewEastNorthPoint(EastNorth eastNorth) {
-            this.eastNorth = eastNorth;
+            this.eastNorth = Objects.requireNonNull(eastNorth, "eastNorth");
         }
 
         @Override
@@ -668,6 +682,39 @@ public final class MapViewState implements Serializable {
         public boolean isInView() {
             return getInView().intersects(getViewArea().getInView());
         }
+
+        /**
+         * Gets the entry point at which a line between start and end enters the current view.
+         * @param start The start
+         * @param end The end
+         * @return The entry point or <code>null</code> if the line does not intersect this view.
+         */
+        public MapViewPoint getLineEntry(MapViewPoint start, MapViewPoint end) {
+            ProjectionBounds bounds = getProjectionBounds();
+            if (bounds.contains(start.getEastNorth())) {
+                return start;
+            }
+
+            double dx = end.getEastNorth().east() - start.getEastNorth().east();
+            double boundX = dx > 0 ? bounds.minEast : bounds.maxEast;
+            EastNorth borderIntersection = Geometry.getSegmentSegmentIntersection(start.getEastNorth(), end.getEastNorth(),
+                    new EastNorth(boundX, bounds.minNorth),
+                    new EastNorth(boundX, bounds.maxNorth));
+            if (borderIntersection != null) {
+                return getPointFor(borderIntersection);
+            }
+
+            double dy = end.getEastNorth().north() - start.getEastNorth().north();
+            double boundY = dy > 0 ? bounds.minNorth : bounds.maxNorth;
+            borderIntersection = Geometry.getSegmentSegmentIntersection(start.getEastNorth(), end.getEastNorth(),
+                    new EastNorth(bounds.minEast, boundY),
+                    new EastNorth(bounds.maxEast, boundY));
+            if (borderIntersection != null) {
+                return getPointFor(borderIntersection);
+            }
+
+            return null;
+        }
     }
 
 }
diff --git a/src/org/openstreetmap/josm/gui/NavigatableComponent.java b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
index 56db076..2f35963 100644
--- a/src/org/openstreetmap/josm/gui/NavigatableComponent.java
+++ b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
@@ -303,16 +303,6 @@ public class NavigatableComponent extends JComponent implements Helpful {
         zoomTo(state.getCenterAtPixel().getEastNorth(), scaleZoomOut());
     }
 
-    /**
-     * Returns current data set. To be removed: end of 2016.
-     * @return current data set
-     * @deprecated Use {@link Main#getLayerManager()}.getEditDataSet() instead.
-     */
-    @Deprecated
-    protected DataSet getCurrentDataSet() {
-        return Main.getLayerManager().getEditDataSet();
-    }
-
     protected void updateLocationState() {
         if (isVisibleOnScreen()) {
             state = state.usingLocation(this);
diff --git a/src/org/openstreetmap/josm/gui/Notification.java b/src/org/openstreetmap/josm/gui/Notification.java
index 70bb0b8..b10cc0e 100644
--- a/src/org/openstreetmap/josm/gui/Notification.java
+++ b/src/org/openstreetmap/josm/gui/Notification.java
@@ -52,13 +52,13 @@ public class Notification {
     /**
      * Somewhat longer message (10 s).
      */
-    public static final int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10000);
+    public static final int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10_000);
 
     /**
      * Long text.
      * (Make sure is still sensible to show as a notification)
      */
-    public static final int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20000);
+    public static final int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20_000);
 
     private Component content;
     private int duration = Notification.TIME_DEFAULT;
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
index c9d8b22..1632c92 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
@@ -38,6 +38,7 @@ import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
+import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.layer.AbstractCachedTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
@@ -127,7 +128,12 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
         Map<String, String> headers = new HashMap<>();
         headers.put("User-Agent", Version.getInstance().getFullAgentString());
 
-        cachedLoader = AbstractCachedTileSourceLayer.getTileLoaderFactory("TMS", TMSCachedTileLoader.class).makeTileLoader(this, headers);
+        TileLoaderFactory cachedLoaderFactory = AbstractCachedTileSourceLayer.getTileLoaderFactory("TMS", TMSCachedTileLoader.class);
+        if (cachedLoaderFactory != null) {
+            cachedLoader = cachedLoaderFactory.makeTileLoader(this, headers);
+        } else {
+            cachedLoader = null;
+        }
 
         uncachedLoader = new OsmTileLoader(this);
         uncachedLoader.headers.putAll(headers);
@@ -205,7 +211,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
     }
 
     public final void setFileCacheEnabled(boolean enabled) {
-        if (enabled) {
+        if (enabled && cachedLoader != null) {
             setTileLoader(cachedLoader);
         } else {
             setTileLoader(uncachedLoader);
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java b/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
index a36cee3..81c17f5 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
@@ -225,11 +225,9 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
     protected void fireFrozenChanged(boolean oldValue, boolean newValue) {
         synchronized (listeners) {
             PropertyChangeEvent evt = new PropertyChangeEvent(this, FROZEN_PROP, oldValue, newValue);
-            for (PropertyChangeListener listener: listeners) {
-                listener.propertyChange(evt);
+            listeners.forEach(listener -> listener.propertyChange(evt));
             }
         }
-    }
 
     public final void setFrozen(boolean isFrozen) {
         boolean oldValue = this.isFrozen;
@@ -677,11 +675,8 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
 
             if (row >= getEntries().size()) return false;
             T e1 = getEntries().get(row);
-            for (T e2: getOppositeEntries()) {
-                if (isEqualEntry(e1, e2)) return true;
+            return getOppositeEntries().stream().anyMatch(e2 -> isEqualEntry(e1, e2));
             }
-            return false;
-        }
 
         protected List<T> getEntries() {
             return entries.get(role);
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/package-info.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/package-info.java
new file mode 100644
index 0000000..7253af7
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for displaying conflicts in ways list of nodes.
+ */
+package org.openstreetmap.josm.gui.conflict.pair.nodes;
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/package-info.java b/src/org/openstreetmap/josm/gui/conflict/pair/package-info.java
new file mode 100644
index 0000000..f62fe1d
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for displaying conflicts as pair of lists.
+ */
+package org.openstreetmap.josm.gui.conflict.pair;
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/properties/package-info.java b/src/org/openstreetmap/josm/gui/conflict/pair/properties/package-info.java
new file mode 100644
index 0000000..6813120
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/properties/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for displaying conflicts in OSM primitive properties.
+ */
+package org.openstreetmap.josm.gui.conflict.pair.properties;
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/package-info.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/package-info.java
new file mode 100644
index 0000000..12bfd02
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for displaying conflicts in OSM primitive relation memberships.
+ */
+package org.openstreetmap.josm.gui.conflict.pair.relation;
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/tags/package-info.java b/src/org/openstreetmap/josm/gui/conflict/pair/tags/package-info.java
new file mode 100644
index 0000000..8db089f
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/tags/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for displaying conflicts in OSM primitive tags.
+ */
+package org.openstreetmap.josm.gui.conflict.pair.tags;
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/package-info.java b/src/org/openstreetmap/josm/gui/conflict/tags/package-info.java
new file mode 100644
index 0000000..9e435f1
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for resolving conflicts between OSM tags.
+ */
+package org.openstreetmap.josm.gui.conflict.tags;
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java b/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java
index fb8d5af..a8f7ea3 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java
@@ -90,7 +90,7 @@ public class PrimitiveTransferable implements Transferable {
         final StringBuilder sb = new StringBuilder();
         for (PrimitiveData primitive : primitives.getDirectlyAdded()) {
             if (sb.length() > 0) {
-                sb.append("\n");
+                sb.append('\n');
             }
             sb.append(OsmPrimitiveType.from(primitive).getAPIName()).append(' ').append(primitive.getId());
         }
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/TagTransferable.java b/src/org/openstreetmap/josm/gui/datatransfer/TagTransferable.java
index 48668a4..f1f3255 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/TagTransferable.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/TagTransferable.java
@@ -16,7 +16,7 @@ import org.openstreetmap.josm.gui.datatransfer.data.TagTransferData;
  * @since 10637
  */
 public class TagTransferable implements Transferable {
-    private TagTransferData data;
+    private final TagTransferData data;
 
     /**
      * Transfer the tag transfer data.
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java b/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java
index 91a235c..3dfdbcb 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java
@@ -18,6 +18,7 @@ import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.tools.CompositeList;
 
 /**
  * A list of primitives that are transfered. The list allows you to implicitly add primitives.
@@ -39,7 +40,7 @@ public final class PrimitiveTransferData implements Serializable {
             if (primitive instanceof Way) {
                 return ((Way) primitive).getNodes();
             } else if (primitive instanceof Relation) {
-                return ((Relation) primitive).getMemberPrimitives();
+                return ((Relation) primitive).getMemberPrimitivesList();
             } else {
                 return Collections.emptyList();
             }
@@ -101,10 +102,7 @@ public final class PrimitiveTransferData implements Serializable {
      * @return That list.
      */
     public Collection<PrimitiveData> getAll() {
-        ArrayList<PrimitiveData> list = new ArrayList<>();
-        list.addAll(direct);
-        list.addAll(referenced);
-        return list;
+        return new CompositeList<>(direct, referenced);
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/dialogs/CommandListMutableTreeNode.java b/src/org/openstreetmap/josm/gui/dialogs/CommandListMutableTreeNode.java
index 5c23368..a8412b6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/CommandListMutableTreeNode.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/CommandListMutableTreeNode.java
@@ -11,19 +11,32 @@ import org.openstreetmap.josm.command.PseudoCommand;
  */
 public class CommandListMutableTreeNode extends DefaultMutableTreeNode {
 
-    protected transient PseudoCommand cmd;
-    protected int idx;
+    protected final transient PseudoCommand cmd;
+    protected final int idx;
 
+    /**
+     * Constructs a new {@code CommandListMutableTreeNode}.
+     * @param cmd command
+     * @param idx index
+     */
     public CommandListMutableTreeNode(PseudoCommand cmd, int idx) {
         super(new JLabel(cmd.getDescriptionText(), cmd.getDescriptionIcon(), JLabel.HORIZONTAL));
         this.cmd = cmd;
         this.idx = idx;
     }
 
+    /**
+     * Returns the command.
+     * @return the command
+     */
     public PseudoCommand getCommand() {
         return cmd;
     }
 
+    /**
+     * Returns the index.
+     * @return the index
+     */
     public int getIndex() {
         return idx;
     }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java b/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
index bc62e2c..8f5b453 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
@@ -106,10 +106,9 @@ public class InspectPrimitiveDialog extends ExtendedDialog {
 
     protected static String buildDataText(OsmDataLayer layer, List<OsmPrimitive> primitives) {
         InspectPrimitiveDataText dt = new InspectPrimitiveDataText(layer);
-        primitives.sort(new OsmPrimitiveComparator());
-        for (OsmPrimitive o : primitives) {
-            dt.addPrimitive(o);
-        }
+        primitives.stream()
+                .sorted(OsmPrimitiveComparator.orderingWaysRelationsNodes().thenComparing(OsmPrimitiveComparator.comparingNames()))
+                .forEachOrdered(dt::addPrimitive);
         return dt.toString();
     }
 
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
index bb144a3..d4d85f5 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
@@ -8,12 +8,9 @@ import java.awt.Component;
 import java.awt.GridBagLayout;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.util.ArrayList;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -43,30 +40,6 @@ public class LatLonDialog extends ExtendedDialog {
     private LatLon latLonCoordinates;
     private EastNorth eastNorthCoordinates;
 
-    private static final Double ZERO = 0.0;
-    private static final String DEG = "\u00B0";
-    private static final String MIN = "\u2032";
-    private static final String SEC = "\u2033";
-
-    private static final char N_TR = LatLon.NORTH.charAt(0);
-    private static final char S_TR = LatLon.SOUTH.charAt(0);
-    private static final char E_TR = LatLon.EAST.charAt(0);
-    private static final char W_TR = LatLon.WEST.charAt(0);
-
-    private static final Pattern P = Pattern.compile(
-            "([+|-]?\\d+[.,]\\d+)|"             // (1)
-            + "([+|-]?\\d+)|"                   // (2)
-            + "("+DEG+"|o|deg)|"                // (3)
-            + "('|"+MIN+"|min)|"                // (4)
-            + "(\"|"+SEC+"|sec)|"               // (5)
-            + "(,|;)|"                          // (6)
-            + "([NSEW"+N_TR+S_TR+E_TR+W_TR+"])|"// (7)
-            + "\\s+|"
-            + "(.+)");
-
-    private static final Pattern P_XML = Pattern.compile(
-            "lat=[\"']([+|-]?\\d+[.,]\\d+)[\"']\\s+lon=[\"']([+|-]?\\d+[.,]\\d+)[\"']");
-
     protected JPanel buildLatLon() {
         JPanel pnl = new JPanel(new GridBagLayout());
         pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -172,6 +145,12 @@ public class LatLonDialog extends ExtendedDialog {
             }
         });
         setContent(tabs, false);
+        addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowOpened(WindowEvent e) {
+                tfLatLon.requestFocusInWindow();
+            }
+        });
     }
 
     public LatLonDialog(Component parent, String title, String help) {
@@ -230,7 +209,7 @@ public class LatLonDialog extends ExtendedDialog {
     protected void parseLatLonUserInput() {
         LatLon latLon;
         try {
-            latLon = parseLatLon(tfLatLon.getText());
+            latLon = LatLon.parse(tfLatLon.getText());
             if (!LatLon.isValidLat(latLon.lat()) || !LatLon.isValidLon(latLon.lon())) {
                 latLon = null;
             }
@@ -338,94 +317,15 @@ public class LatLonDialog extends ExtendedDialog {
         }
     }
 
+    /**
+     * Parses the given string as lat/lon.
+     * @param coord String to parse
+     * @return parsed lat/lon
+     * @deprecated use {@link LatLon#parse(String)} instead
+     */
+    @Deprecated
     public static LatLon parseLatLon(final String coord) {
-        final LatLonHolder latLon = new LatLonHolder();
-        final Matcher mXml = P_XML.matcher(coord);
-        if (mXml.matches()) {
-            setLatLonObj(latLon,
-                    Double.valueOf(mXml.group(1).replace(',', '.')), ZERO, ZERO, "N",
-                    Double.valueOf(mXml.group(2).replace(',', '.')), ZERO, ZERO, "E");
-        } else {
-            final Matcher m = P.matcher(coord);
-
-            final StringBuilder sb = new StringBuilder();
-            final List<Object> list = new ArrayList<>();
-
-            while (m.find()) {
-                if (m.group(1) != null) {
-                    sb.append('R');     // floating point number
-                    list.add(Double.valueOf(m.group(1).replace(',', '.')));
-                } else if (m.group(2) != null) {
-                    sb.append('Z');     // integer number
-                    list.add(Double.valueOf(m.group(2)));
-                } else if (m.group(3) != null) {
-                    sb.append('o');     // degree sign
-                } else if (m.group(4) != null) {
-                    sb.append('\'');    // seconds sign
-                } else if (m.group(5) != null) {
-                    sb.append('"');     // minutes sign
-                } else if (m.group(6) != null) {
-                    sb.append(',');     // separator
-                } else if (m.group(7) != null) {
-                    sb.append('x');     // cardinal direction
-                    String c = m.group(7).toUpperCase(Locale.ENGLISH);
-                    if ("N".equals(c) || "S".equals(c) || "E".equals(c) || "W".equals(c)) {
-                        list.add(c);
-                    } else {
-                        list.add(c.replace(N_TR, 'N').replace(S_TR, 'S')
-                                .replace(E_TR, 'E').replace(W_TR, 'W'));
-                    }
-                } else if (m.group(8) != null) {
-                    throw new IllegalArgumentException("invalid token: " + m.group(8));
-                }
-            }
-
-            final String pattern = sb.toString();
-
-            final Object[] params = list.toArray();
-
-            if (pattern.matches("Ro?,?Ro?")) {
-                setLatLonObj(latLon,
-                        params[0], ZERO, ZERO, "N",
-                        params[1], ZERO, ZERO, "E");
-            } else if (pattern.matches("xRo?,?xRo?")) {
-                setLatLonObj(latLon,
-                        params[1], ZERO, ZERO, params[0],
-                        params[3], ZERO, ZERO, params[2]);
-            } else if (pattern.matches("Ro?x,?Ro?x")) {
-                setLatLonObj(latLon,
-                        params[0], ZERO, ZERO, params[1],
-                        params[2], ZERO, ZERO, params[3]);
-            } else if (pattern.matches("Zo[RZ]'?,?Zo[RZ]'?|Z[RZ],?Z[RZ]")) {
-                setLatLonObj(latLon,
-                        params[0], params[1], ZERO, "N",
-                        params[2], params[3], ZERO, "E");
-            } else if (pattern.matches("xZo[RZ]'?,?xZo[RZ]'?|xZo?[RZ],?xZo?[RZ]")) {
-                setLatLonObj(latLon,
-                        params[1], params[2], ZERO, params[0],
-                        params[4], params[5], ZERO, params[3]);
-            } else if (pattern.matches("Zo[RZ]'?x,?Zo[RZ]'?x|Zo?[RZ]x,?Zo?[RZ]x")) {
-                setLatLonObj(latLon,
-                        params[0], params[1], ZERO, params[2],
-                        params[3], params[4], ZERO, params[5]);
-            } else if (pattern.matches("ZoZ'[RZ]\"?x,?ZoZ'[RZ]\"?x|ZZ[RZ]x,?ZZ[RZ]x")) {
-                setLatLonObj(latLon,
-                        params[0], params[1], params[2], params[3],
-                        params[4], params[5], params[6], params[7]);
-            } else if (pattern.matches("xZoZ'[RZ]\"?,?xZoZ'[RZ]\"?|xZZ[RZ],?xZZ[RZ]")) {
-                setLatLonObj(latLon,
-                        params[1], params[2], params[3], params[0],
-                        params[5], params[6], params[7], params[4]);
-            } else if (pattern.matches("ZZ[RZ],?ZZ[RZ]")) {
-                setLatLonObj(latLon,
-                        params[0], params[1], params[2], "N",
-                        params[3], params[4], params[5], "E");
-            } else {
-                throw new IllegalArgumentException("invalid format: " + pattern);
-            }
-        }
-
-        return new LatLon(latLon.lat, latLon.lon);
+        return LatLon.parse(coord);
     }
 
     public static EastNorth parseEastNorth(String s) {
@@ -440,43 +340,6 @@ public class LatLonDialog extends ExtendedDialog {
         }
     }
 
-    private static class LatLonHolder {
-        private double lat;
-        private double lon;
-    }
-
-    private static void setLatLonObj(final LatLonHolder latLon,
-            final Object coord1deg, final Object coord1min, final Object coord1sec, final Object card1,
-            final Object coord2deg, final Object coord2min, final Object coord2sec, final Object card2) {
-
-        setLatLon(latLon,
-                (Double) coord1deg, (Double) coord1min, (Double) coord1sec, (String) card1,
-                (Double) coord2deg, (Double) coord2min, (Double) coord2sec, (String) card2);
-    }
-
-    private static void setLatLon(final LatLonHolder latLon,
-            final double coord1deg, final double coord1min, final double coord1sec, final String card1,
-            final double coord2deg, final double coord2min, final double coord2sec, final String card2) {
-
-        setLatLon(latLon, coord1deg, coord1min, coord1sec, card1);
-        setLatLon(latLon, coord2deg, coord2min, coord2sec, card2);
-    }
-
-    private static void setLatLon(final LatLonHolder latLon, final double coordDeg, final double coordMin, final double coordSec,
-            final String card) {
-        if (coordDeg < -180 || coordDeg > 180 || coordMin < 0 || coordMin >= 60 || coordSec < 0 || coordSec > 60) {
-            throw new IllegalArgumentException("out of range");
-        }
-
-        double coord = (coordDeg < 0 ? -1 : 1) * (Math.abs(coordDeg) + coordMin / 60 + coordSec / 3600);
-        coord = "N".equals(card) || "E".equals(card) ? coord : -coord;
-        if ("N".equals(card) || "S".equals(card)) {
-            latLon.lat = coord;
-        } else {
-            latLon.lon = coord;
-        }
-    }
-
     public String getLatLonText() {
         return tfLatLon.getText();
     }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java b/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
index bae3404..16edff0 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
@@ -112,9 +112,17 @@ public final class MenuItemSearchDialog extends ExtendedDialog {
 
     public static class Action extends JosmAction {
 
+        // CHECKSTYLE.OFF: LineLength
+        /** Action shortcut (ctrl / space by default */
+        public static final Shortcut SHORTCUT = Shortcut.registerShortcut("help:search-items", "Search menu items", KeyEvent.VK_SPACE, Shortcut.CTRL);
+        // CHECKSTYLE.ON: LineLength
+
+        /**
+         * Constructs a new {@code Action}.
+         */
         public Action() {
             super(tr("Search menu items"), "dialogs/search", null,
-                    Shortcut.registerShortcut("help:search-items", "Search menu items", KeyEvent.VK_SPACE, Shortcut.CTRL),
+                    SHORTCUT,
                     true, "dialogs/search-items", false);
         }
 
diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
index aa1a53e..1756e93 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
@@ -44,6 +44,7 @@ import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -61,6 +62,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
     private final NewAction newAction;
     private final ReopenAction reopenAction;
     private final SortAction sortAction;
+    private final OpenInBrowserAction openInBrowserAction;
     private final UploadNotesAction uploadAction;
 
     private transient NoteData noteData;
@@ -74,6 +76,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
         newAction = new NewAction();
         reopenAction = new ReopenAction();
         sortAction = new SortAction();
+        openInBrowserAction = new OpenInBrowserAction();
         uploadAction = new UploadNotesAction();
         buildDialog();
         Main.getLayerManager().addLayerChangeListener(this);
@@ -112,6 +115,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
                 new SideButton(closeAction, false),
                 new SideButton(reopenAction, false),
                 new SideButton(sortAction, false),
+                new SideButton(openInBrowserAction, false),
                 new SideButton(uploadAction, false)}));
         updateButtonStates();
     }
@@ -130,6 +134,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
             addCommentAction.setEnabled(false);
             reopenAction.setEnabled(true);
         }
+        openInBrowserAction.setEnabled(noteData != null && noteData.getSelectedNote() != null && noteData.getSelectedNote().getId() > 0);
         if (noteData == null || !noteData.isModified()) {
             uploadAction.setEnabled(false);
         } else {
@@ -401,4 +406,20 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
             }
         }
     }
+
+    class OpenInBrowserAction extends AbstractAction {
+        OpenInBrowserAction() {
+            putValue(SHORT_DESCRIPTION, tr("Open the note in an external browser"));
+            new ImageProvider("help", "internet").getResource().attachImageIcon(this, true);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            final Note note = displayList.getSelectedValue();
+            if (note.getId() > 0) {
+                final String url = Main.getBaseBrowseUrl() + "/note/" + note.getId();
+                OpenBrowser.displayUrl(url);
+            }
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java b/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
index 8c1ceba..61d8b2a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
@@ -12,9 +12,9 @@ import java.awt.event.WindowListener;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.swing.BorderFactory;
@@ -205,7 +205,8 @@ public class OsmIdSelectionDialog extends ExtendedDialog implements WindowListen
             final String parsedText = ids.stream().map(x -> x.getType().getAPIName().charAt(0) + String.valueOf(x.getUniqueId()))
                     .collect(Collectors.joining(", "));
             tfId.tryToPasteFrom(parsedText);
-            final Set<OsmPrimitiveType> types = ids.stream().map(SimplePrimitiveId::getType).collect(Collectors.toSet());
+            final EnumSet<OsmPrimitiveType> types = ids.stream().map(SimplePrimitiveId::getType).collect(
+                    Collectors.toCollection(() -> EnumSet.noneOf(OsmPrimitiveType.class)));
             if (types.size() == 1) {
                 // select corresponding type
                 cbType.setSelectedItem(types.iterator().next());
diff --git a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
index 436b3ab..0fd02be 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
@@ -656,9 +656,11 @@ public class SelectionListDialog extends ToggleDialog {
          * Sorts the current elements in the selection
          */
         public synchronized void sort() {
-            if (selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100000)) {
-                boolean quick = selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10000);
-                selection.sort(new OsmPrimitiveComparator(quick, false));
+            if (selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100_000)) {
+                boolean quick = selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10_000);
+                selection.sort(OsmPrimitiveComparator.orderingWaysRelationsNodes().thenComparing(quick
+                        ? OsmPrimitiveComparator.comparingUniqueId()
+                        : OsmPrimitiveComparator.comparingNames()));
             }
         }
 
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
index cad3bae..570438f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
@@ -18,7 +18,9 @@ import java.awt.event.WindowEvent;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
 import javax.swing.DefaultListSelectionModel;
@@ -46,18 +48,23 @@ import org.openstreetmap.josm.actions.downloadtasks.ChangesetQueryTask;
 import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.ChangesetCache;
+import org.openstreetmap.josm.data.osm.ChangesetDataSet;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.dialogs.changeset.query.ChangesetQueryDialog;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.io.CloseChangesetTask;
+import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.io.ChangesetQuery;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
+import org.openstreetmap.josm.tools.StreamUtils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -106,6 +113,7 @@ public class ChangesetCacheManager extends JFrame {
     private CloseSelectedChangesetsAction actCloseSelectedChangesetsAction;
     private DownloadSelectedChangesetsAction actDownloadSelectedChangesets;
     private DownloadSelectedChangesetContentAction actDownloadSelectedContent;
+    private DownloadSelectedChangesetObjectsAction actDownloadSelectedChangesetObjects;
     private JTable tblChangesets;
 
     /**
@@ -240,6 +248,10 @@ public class ChangesetCacheManager extends JFrame {
         model.getSelectionModel().addListSelectionListener(actDownloadSelectedContent);
         tb.add(actDownloadSelectedContent);
 
+        // -- download the objects contained in the selected changesets from the OSM server
+        model.getSelectionModel().addListSelectionListener(actDownloadSelectedChangesetObjects);
+        tb.add(actDownloadSelectedChangesetObjects);
+
         pnl.add(tb, BorderLayout.CENTER);
         return pnl;
     }
@@ -281,6 +293,7 @@ public class ChangesetCacheManager extends JFrame {
         actCloseSelectedChangesetsAction = new CloseSelectedChangesetsAction(model);
         actDownloadSelectedChangesets = new DownloadSelectedChangesetsAction(model);
         actDownloadSelectedContent = new DownloadSelectedChangesetContentAction(model);
+        actDownloadSelectedChangesetObjects = new DownloadSelectedChangesetObjectsAction(model);
 
         cp.add(buildToolbarPanel(), BorderLayout.NORTH);
         cp.add(buildContentPanel(), BorderLayout.CENTER);
@@ -537,6 +550,46 @@ public class ChangesetCacheManager extends JFrame {
         }
     }
 
+    /**
+     * Downloads the objects contained in the selected changesets from the OSM server
+     */
+    private class DownloadSelectedChangesetObjectsAction extends AbstractAction implements ListSelectionListener {
+
+        DownloadSelectedChangesetObjectsAction(ChangesetCacheManagerModel model) {
+            putValue(NAME, tr("Download changed objects"));
+            new ImageProvider("downloadprimitive").getResource().attachImageIcon(this);
+            putValue(SHORT_DESCRIPTION, tr("Download the current version of the changed objects in the selected changesets"));
+            updateEnabledState();
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            if (!GraphicsEnvironment.isHeadless()) {
+                actDownloadSelectedContent.actionPerformed(e);
+                Main.worker.submit(() -> {
+                    final List<PrimitiveId> primitiveIds = model.getSelectedChangesets().stream()
+                            .map(Changeset::getContent)
+                            .filter(Objects::nonNull)
+                            .flatMap(content -> StreamUtils.toStream(content::iterator))
+                            .map(ChangesetDataSet.ChangesetDataSetEntry::getPrimitive)
+                            .map(HistoryOsmPrimitive::getPrimitiveId)
+                            .distinct()
+                            .collect(Collectors.toList());
+                    new DownloadPrimitivesWithReferrersTask(false, primitiveIds, true, true, null, null).run();
+                });
+            }
+        }
+
+        protected void updateEnabledState() {
+            setEnabled(model.hasSelectedChangesets() && !Main.isOffline(OnlineResource.OSM_API));
+        }
+
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+            updateEnabledState();
+        }
+    }
+
     static class ShowDetailAction extends AbstractAction {
         private final ChangesetCacheManagerModel model;
 
@@ -618,6 +671,7 @@ public class ChangesetCacheManager extends JFrame {
             add(actCloseSelectedChangesetsAction);
             add(actDownloadSelectedChangesets);
             add(actDownloadSelectedContent);
+            add(actDownloadSelectedChangesetObjects);
         }
     }
 
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
index 3496a83..88a942f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
@@ -10,11 +10,14 @@ import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.text.DateFormat;
-import java.text.ParseException;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.format.FormatStyle;
 import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
@@ -841,22 +844,18 @@ public class AdvancedChangesetQueryPanel extends JPanel {
             if (!isValidChangesetQuery())
                 throw new IllegalStateException(tr("Cannot build changeset query with time based restrictions. Input is not valid."));
             if (rbClosedAfter.isSelected()) {
-                GregorianCalendar cal = new GregorianCalendar();
-                Date d1 = valClosedAfterDate1.getDate();
-                Date d2 = valClosedAfterTime1.getDate();
-                cal.setTimeInMillis(d1.getTime() + (d2 == null ? 0 : d2.getTime()));
-                query.closedAfter(cal.getTime());
+                LocalDate d1 = valClosedAfterDate1.getDate();
+                LocalTime d2 = valClosedAfterTime1.getDate();
+                final Date d3 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+                query.closedAfter(d3);
             } else if (rbClosedAfterAndCreatedBefore.isSelected()) {
-                GregorianCalendar cal = new GregorianCalendar();
-                Date d1 = valClosedAfterDate2.getDate();
-                Date d2 = valClosedAfterTime2.getDate();
-                cal.setTimeInMillis(d1.getTime() + (d2 == null ? 0 : d2.getTime()));
-                Date d3 = cal.getTime();
+                LocalDate d1 = valClosedAfterDate2.getDate();
+                LocalTime d2 = valClosedAfterTime2.getDate();
+                Date d3 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
 
                 d1 = valCreatedBeforeDate.getDate();
                 d2 = valCreatedBeforeTime.getDate();
-                cal.setTimeInMillis(d1.getTime() + (d2 == null ? 0 : d2.getTime()));
-                Date d4 = cal.getTime();
+                Date d4 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
 
                 query.closedAfterAndCreatedBefore(d3, d4);
             }
@@ -1041,17 +1040,17 @@ public class AdvancedChangesetQueryPanel extends JPanel {
         }
 
         public String getStandardTooltipText() {
-            Date date = new Date();
+            final ZonedDateTime now = ZonedDateTime.now();
             return tr(
                     "Please enter a date in the usual format for your locale.<br>"
                     + "Example: {0}<br>"
                     + "Example: {1}<br>"
                     + "Example: {2}<br>"
                     + "Example: {3}<br>",
-                    DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()).format(date),
-                    DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault()).format(date),
-                    DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault()).format(date),
-                    DateFormat.getDateInstance(DateFormat.FULL, Locale.getDefault()).format(date)
+                    DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).format(now),
+                    DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(now),
+                    DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).format(now),
+                    DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).format(now)
             );
         }
 
@@ -1067,12 +1066,12 @@ public class AdvancedChangesetQueryPanel extends JPanel {
             }
         }
 
-        public Date getDate() {
-            for (int format: new int[] {DateFormat.SHORT, DateFormat.MEDIUM, DateFormat.LONG, DateFormat.FULL}) {
-                DateFormat df = DateFormat.getDateInstance(format);
+        public LocalDate getDate() {
+            for (final FormatStyle format: FormatStyle.values()) {
+                DateTimeFormatter df = DateTimeFormatter.ofLocalizedDate(format);
                 try {
-                    return df.parse(getComponent().getText());
-                } catch (ParseException e) {
+                    return LocalDate.parse(getComponent().getText(), df);
+                } catch (DateTimeParseException e) {
                     // Try next format
                     Main.trace(e);
                 }
@@ -1108,17 +1107,17 @@ public class AdvancedChangesetQueryPanel extends JPanel {
         }
 
         public String getStandardTooltipText() {
-            Date date = new Date();
+            final ZonedDateTime now = ZonedDateTime.now();
             return tr(
                     "Please enter a valid time in the usual format for your locale.<br>"
                     + "Example: {0}<br>"
                     + "Example: {1}<br>"
                     + "Example: {2}<br>"
                     + "Example: {3}<br>",
-                    DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(date),
-                    DateFormat.getTimeInstance(DateFormat.MEDIUM, Locale.getDefault()).format(date),
-                    DateFormat.getTimeInstance(DateFormat.LONG, Locale.getDefault()).format(date),
-                    DateFormat.getTimeInstance(DateFormat.FULL, Locale.getDefault()).format(date)
+                    DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).format(now),
+                    DateTimeFormatter.ofLocalizedTime(FormatStyle.MEDIUM).format(now),
+                    DateTimeFormatter.ofLocalizedTime(FormatStyle.LONG).format(now),
+                    DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).format(now)
             );
         }
 
@@ -1134,18 +1133,20 @@ public class AdvancedChangesetQueryPanel extends JPanel {
             }
         }
 
-        public Date getDate() {
+        public LocalTime getDate() {
             if (getComponent().getText().trim().isEmpty())
-                return null;
+                return LocalTime.MIDNIGHT;
 
-            for (int style : new int[]{DateFormat.SHORT, DateFormat.MEDIUM, DateFormat.LONG, DateFormat.FULL}) {
+            for (final FormatStyle format: FormatStyle.values()) {
+                DateTimeFormatter df = DateTimeFormatter.ofLocalizedTime(format);
                 try {
-                    return DateFormat.getTimeInstance(style, Locale.getDefault()).parse(getComponent().getText());
-                } catch (ParseException e) {
-                    continue;
+                    return LocalTime.parse(getComponent().getText(), df);
+                } catch (DateTimeParseException e) {
+                    // Try next format
+                    Main.trace(e);
                 }
             }
-            return null;
+            return LocalTime.MIDNIGHT;
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java
index d3849f3..b326aea 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java
@@ -10,10 +10,10 @@ import java.util.List;
 import javax.swing.AbstractAction;
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -43,10 +43,14 @@ public final class DeleteLayerAction extends AbstractAction implements IEnabledS
         List<Layer> selectedLayers = model.getSelectedLayers();
         if (selectedLayers.isEmpty())
             return;
-        if (!Main.saveUnsavedModifications(selectedLayers, false))
+        if (!SaveLayersDialog.saveUnsavedModifications(selectedLayers, SaveLayersDialog.Reason.DELETE))
             return;
         for (Layer l: selectedLayers) {
-            Main.getLayerManager().removeLayer(l);
+            if (model.getLayerManager().containsLayer(l)) {
+                // it may happen that this call removes other layers.
+                // this is why we need to check if every layer is still in the list of selected layers.
+                model.getLayerManager().removeLayer(l);
+            }
         }
     }
 
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
index 664b9a3..be55747 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.Component;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.MouseWheelEvent;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -39,6 +40,10 @@ import org.openstreetmap.josm.tools.Utils;
  */
 public final class LayerVisibilityAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
     private static final int SLIDER_STEPS = 100;
+    /**
+     * Steps the value is changed by a mouse wheel change (one full click)
+     */
+    private static final int SLIDER_WHEEL_INCREMENT = 5;
     private static final double MAX_SHARPNESS_FACTOR = 2;
     private static final double MAX_COLORFUL_FACTOR = 2;
     private final LayerListModel model;
@@ -55,6 +60,8 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
     public LayerVisibilityAction(LayerListModel model) {
         this.model = model;
         popup = new JPopupMenu();
+        // prevent popup close on mouse wheel move
+        popup.addMouseWheelListener(MouseWheelEvent::consume);
 
         // just to add a border
         JPanel content = new JPanel();
@@ -76,9 +83,14 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
     }
 
     private void addSlider(JPanel content, FilterSlider<?> slider) {
-        content.add(new JLabel(slider.getIcon()), GBC.std().span(1, 2).insets(0, 0, 5, 0));
-        content.add(new JLabel(slider.getLabel()), GBC.eol());
-        content.add(slider, GBC.eop());
+        // wrap to a common content pane to allow for mouse wheel listener on label.
+        JPanel container = new JPanel(new GridBagLayout());
+        container.add(new JLabel(slider.getIcon()), GBC.std().span(1, 2).insets(0, 0, 5, 0));
+        container.add(new JLabel(slider.getLabel()), GBC.eol());
+        container.add(slider, GBC.eol());
+        content.add(container, GBC.eop());
+
+        container.addMouseWheelListener(slider::mouseWheelMoved);
         sliders.add(slider);
     }
 
@@ -185,6 +197,22 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
             }
         }
 
+        protected void mouseWheelMoved(MouseWheelEvent e) {
+            e.consume();
+            if (!isEnabled()) {
+                // ignore mouse wheel in disabled state.
+                return;
+            }
+            double rotation = -1 * e.getPreciseWheelRotation();
+            double destinationValue = getValue() + rotation * SLIDER_WHEEL_INCREMENT;
+            if (rotation < 0) {
+                destinationValue = Math.floor(destinationValue);
+            } else {
+                destinationValue = Math.ceil(destinationValue);
+            }
+            setValue(Utils.clamp((int) destinationValue, getMinimum(), getMaximum()));
+        }
+
         protected void applyValueToLayer(T layer) {
         }
 
@@ -203,13 +231,7 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
 
         protected int convertFromRealValue(double value) {
             int i = (int) ((value - minValue) / (maxValue - minValue) * SLIDER_STEPS + .5);
-            if (i < getMinimum()) {
-                return getMinimum();
-            } else if (i > getMaximum()) {
-                return getMaximum();
-            } else {
-                return i;
-            }
+            return Utils.clamp(i, getMinimum(), getMaximum());
         }
 
         public abstract ImageIcon getIcon();
@@ -258,6 +280,18 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
         }
 
         @Override
+        protected void mouseWheelMoved(MouseWheelEvent e) {
+            if (!isEnabled() && !filterLayers(model.getSelectedLayers()).isEmpty() && e.getPreciseWheelRotation() < 0) {
+                // make layer visible and set the value.
+                // this allows users to use the mouse wheel to make the layer visible if it was hidden previously.
+                e.consume();
+                setVisibleFlag(true);
+            } else {
+                super.mouseWheelMoved(e);
+            }
+        }
+
+        @Override
         protected void applyValueToLayer(Layer layer) {
             layer.setOpacity(getRealValue());
         }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
index cbadf74..80769b5 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
@@ -93,7 +93,7 @@ public class PropertiesCellRenderer extends DefaultTableCellRenderer {
                     if (otherCount == 1) {
                         // Find the non-blank value in the map
                         v.entrySet().stream().filter(entry -> !Objects.equals(entry.getKey(), ""))
-                                /* I18n: properties display partial string joined with comma, first is count, second is value */
+                            /* I18n: properties display partial string joined with comma, first is count, second is value */
                             .findAny().ifPresent(entry -> sb.append(tr("{0} ''{1}''", entry.getValue().toString(), entry.getKey())));
                     } else {
                         /* I18n: properties display partial string joined with comma */
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
index 30ea7a2..9e5039d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -1162,47 +1162,49 @@ implements SelectionChangedListener, ActiveLayerChangeListener, DataSetListenerA
                     uris.add(new URI(String.format("%sMap_Features", base)));
                 }
 
-                Main.worker.execute(() -> {
-                    try {
-                        // find a page that actually exists in the wiki
-                        HttpClient.Response conn;
-                        for (URI u : uris) {
-                            conn = HttpClient.create(u.toURL(), "HEAD").connect();
-
-                            if (conn.getResponseCode() != 200) {
-                                conn.disconnect();
-                            } else {
-                                long osize = conn.getContentLength();
-                                if (osize > -1) {
-                                    conn.disconnect();
-
-                                    final URI newURI = new URI(u.toString()
-                                            .replace("=", "%3D") /* do not URLencode whole string! */
-                                            .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
-                                    );
-                                    conn = HttpClient.create(newURI.toURL(), "HEAD").connect();
-                                }
-
-                                /* redirect pages have different content length, but retrieving a "nonredirect"
-                                 *  page using index.php and the direct-link method gives slightly different
-                                 *  content lengths, so we have to be fuzzy.. (this is UGLY, recode if u know better)
-                                 */
-                                if (conn.getContentLength() != -1 && osize > -1 && Math.abs(conn.getContentLength() - osize) > 200) {
-                                    Main.info("{0} is a mediawiki redirect", u);
-                                    conn.disconnect();
-                                } else {
-                                    conn.disconnect();
-
-                                    OpenBrowser.displayUrl(u.toString());
-                                    break;
-                                }
-                            }
+                Main.worker.execute(() -> displayHelp(uris));
+            } catch (URISyntaxException e1) {
+                Main.error(e1);
+            }
+        }
+
+        private void displayHelp(final List<URI> uris) {
+            try {
+                // find a page that actually exists in the wiki
+                HttpClient.Response conn;
+                for (URI u : uris) {
+                    conn = HttpClient.create(u.toURL(), "HEAD").connect();
+
+                    if (conn.getResponseCode() != 200) {
+                        conn.disconnect();
+                    } else {
+                        long osize = conn.getContentLength();
+                        if (osize > -1) {
+                            conn.disconnect();
+
+                            final URI newURI = new URI(u.toString()
+                                    .replace("=", "%3D") /* do not URLencode whole string! */
+                                    .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
+                            );
+                            conn = HttpClient.create(newURI.toURL(), "HEAD").connect();
+                        }
+
+                        /* redirect pages have different content length, but retrieving a "nonredirect"
+                         *  page using index.php and the direct-link method gives slightly different
+                         *  content lengths, so we have to be fuzzy.. (this is UGLY, recode if u know better)
+                         */
+                        if (conn.getContentLength() != -1 && osize > -1 && Math.abs(conn.getContentLength() - osize) > 200) {
+                            Main.info("{0} is a mediawiki redirect", u);
+                            conn.disconnect();
+                        } else {
+                            conn.disconnect();
+
+                            OpenBrowser.displayUrl(u.toString());
+                            break;
                         }
-                    } catch (URISyntaxException | IOException e1) {
-                        Main.error(e1);
                     }
-                });
-            } catch (URISyntaxException e1) {
+                }
+            } catch (URISyntaxException | IOException e1) {
                 Main.error(e1);
             }
         }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
index 62220d8..69c126b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
@@ -798,16 +798,14 @@ public class TagEditHelper {
         public void setContentPane(Container contentPane) {
             final int commandDownMask = GuiHelper.getMenuShortcutKeyMaskEx();
             List<String> lines = new ArrayList<>();
-            Shortcut sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask);
-            if (sc != null) {
-                lines.add(sc.getKeyText() + ' ' + tr("to apply first suggestion"));
-            }
+            Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask).ifPresent(sc ->
+                    lines.add(sc.getKeyText() + ' ' + tr("to apply first suggestion"))
+            );
             lines.add(KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+'+'+KeyEvent.getKeyText(KeyEvent.VK_ENTER) + ' '
                     +tr("to add without closing the dialog"));
-            sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask | KeyEvent.SHIFT_DOWN_MASK);
-            if (sc != null) {
-                lines.add(sc.getKeyText() + ' ' + tr("to add first suggestion without closing the dialog"));
-            }
+            Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask | KeyEvent.SHIFT_DOWN_MASK).ifPresent(sc ->
+                    lines.add(sc.getKeyText() + ' ' + tr("to add first suggestion without closing the dialog"))
+            );
             final JLabel helpLabel = new JLabel("<html>" + Utils.join("<br>", lines) + "</html>");
             helpLabel.setFont(helpLabel.getFont().deriveFont(Font.PLAIN));
             contentPane.add(helpLabel, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(5, 5, 5, 5));
@@ -818,7 +816,7 @@ public class TagEditHelper {
             String s = String.format("%d", PROPERTY_RECENT_TAGS_NUMBER.get());
             while (true) {
                 s = JOptionPane.showInputDialog(this, tr("Please enter the number of recently added tags to display"), s);
-                if (s == null) {
+                if (s == null || s.isEmpty()) {
                     return;
                 }
                 try {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
index 7e3fca2..4029d78 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
@@ -137,6 +137,9 @@ abstract class SavingAction extends AbstractRelationEditorAction {
                         options[0], // OK is default
                         "/Dialog/RelationEditor#RelationChangedOutsideOfEditor"
         );
+        if (ret == 0) {
+            Main.map.conflictDialog.unfurlDialog();
+        }
         return ret == 0;
     }
 
diff --git a/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java b/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
index 969b52e..4a77e6e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
@@ -13,8 +13,8 @@ import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -34,6 +34,7 @@ import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ListenerList;
 
@@ -177,71 +178,74 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
         if (filter != null) {
             filterToUse = filterToUse.and(e -> e.getPrimitives().stream().anyMatch(filter::contains));
         }
-        Map<Severity, Map<String, Map<String, List<TestError>>>> errorTreeDeep
+        Map<Severity, Map<String, Map<String, List<TestError>>>> errorsBySeverityMessageDescription
             = errors.stream().filter(filterToUse).collect(
-                    Collectors.groupingBy(e -> e.getSeverity(), () -> new EnumMap<>(Severity.class),
-                            Collectors.groupingBy(e -> e.getDescription() == null ? "" : e.getDescription(),
-                                    Collectors.groupingBy(e -> e.getMessage()))));
-
-        List<TreePath> expandedPaths = new ArrayList<>();
-        errorTreeDeep.forEach((s, severityErrorsDeep) -> {
+                    Collectors.groupingBy(TestError::getSeverity, () -> new EnumMap<>(Severity.class),
+                            Collectors.groupingBy(TestError::getMessage, () -> new TreeMap<>(AlphanumComparator.getInstance()),
+                                    Collectors.groupingBy(e -> e.getDescription() == null ? "" : e.getDescription(),
+                                            () -> new TreeMap<>(AlphanumComparator.getInstance()),
+                                            Collectors.toList()
+                                    ))));
+
+        final List<TreePath> expandedPaths = new ArrayList<>();
+        errorsBySeverityMessageDescription.forEach((severity, errorsByMessageDescription) -> {
             // Severity node
-            DefaultMutableTreeNode severityNode = new GroupTreeNode(s);
+            final DefaultMutableTreeNode severityNode = new GroupTreeNode(severity);
             rootNode.add(severityNode);
 
-            if (oldSelectedRows.contains(s)) {
+            if (oldSelectedRows.contains(severity)) {
                 expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode}));
             }
 
-            Map<String, List<TestError>> severityErrors = severityErrorsDeep.get("");
-            if (severityErrors != null) {
-                for (Entry<String, List<TestError>> msgErrors : severityErrors.entrySet()) {
-                    // Message node
-                    List<TestError> errs = msgErrors.getValue();
-                    String msg = tr("{0} ({1})", msgErrors.getKey(), errs.size());
-                    DefaultMutableTreeNode messageNode = new DefaultMutableTreeNode(msg);
+            final Map<String, List<TestError>> errorsWithEmptyMessageByDescription = errorsByMessageDescription.get("");
+            if (errorsWithEmptyMessageByDescription != null) {
+                errorsWithEmptyMessageByDescription.forEach((description, errors) -> {
+                    final String msg = tr("{0} ({1})", description, errors.size());
+                    final DefaultMutableTreeNode messageNode = new DefaultMutableTreeNode(msg);
                     severityNode.add(messageNode);
 
-                    if (oldSelectedRows.contains(msgErrors.getKey())) {
+                    if (oldSelectedRows.contains(description)) {
                         expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode, messageNode}));
                     }
 
-                    errs.stream().map(DefaultMutableTreeNode::new).forEach(messageNode::add);
-                }
+                    errors.stream().map(DefaultMutableTreeNode::new).forEach(messageNode::add);
+                });
             }
 
-            severityErrorsDeep.forEach((description, errorlist) -> {
-                if (description.isEmpty()) {
+            errorsByMessageDescription.forEach((message, errorsByDescription) -> {
+                if (message.isEmpty()) {
                     return;
                 }
                 // Group node
-                DefaultMutableTreeNode groupNode;
-                if (errorlist.size() > 1) {
-                    groupNode = new GroupTreeNode(description);
+                final DefaultMutableTreeNode groupNode;
+                if (errorsByDescription.size() > 1) {
+                    groupNode = new GroupTreeNode(message);
                     severityNode.add(groupNode);
-                    if (oldSelectedRows.contains(description)) {
+                    if (oldSelectedRows.contains(message)) {
                         expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode, groupNode}));
                     }
                 } else {
                     groupNode = null;
                 }
 
-                errorlist.forEach((message, errs) -> {
+                errorsByDescription.forEach((description, errors) -> {
                     // Message node
-                    String msg;
+                    final String msg;
                     if (groupNode != null) {
-                        msg = tr("{0} ({1})", message, errs.size());
+                        msg = tr("{0} ({1})", description, errors.size());
+                    } else if (description == null || description.isEmpty()) {
+                        msg = tr("{0} ({1})", message, errors.size());
                     } else {
-                        msg = tr("{0} - {1} ({2})", message, description, errs.size());
+                        msg = tr("{0} - {1} ({2})", message, description, errors.size());
                     }
-                    DefaultMutableTreeNode messageNode = new DefaultMutableTreeNode(msg);
+                    final DefaultMutableTreeNode messageNode = new DefaultMutableTreeNode(msg);
                     if (groupNode != null) {
                         groupNode.add(messageNode);
                     } else {
                         severityNode.add(messageNode);
                     }
 
-                    if (oldSelectedRows.contains(message)) {
+                    if (oldSelectedRows.contains(description)) {
                         if (groupNode != null) {
                             expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode, groupNode, messageNode}));
                         } else {
@@ -249,7 +253,7 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
                         }
                     }
 
-                    errs.stream().map(DefaultMutableTreeNode::new).forEach(messageNode::add);
+                    errors.stream().map(DefaultMutableTreeNode::new).forEach(messageNode::add);
                 });
             });
         });
diff --git a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
index db93adc..c075601 100644
--- a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
@@ -50,17 +50,15 @@ import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.io.NameFinder;
+import org.openstreetmap.josm.io.NameFinder.SearchResult;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.OsmUrlToBounds;
 import org.openstreetmap.josm.tools.Utils;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
 
 /**
  * Place selector.
@@ -75,7 +73,7 @@ public class PlaceSelection implements DownloadSelection {
     private JTable tblSearchResults;
     private DownloadDialog parent;
     private static final Server[] SERVERS = new Server[] {
-        new Server("Nominatim", "https://nominatim.openstreetmap.org/search?format=xml&q=", tr("Class Type"), tr("Bounds"))
+        new Server("Nominatim", NameFinder.NOMINATIM_URL, tr("Class Type"), tr("Bounds"))
     };
     private final JosmComboBox<Server> server = new JosmComboBox<>(SERVERS);
 
@@ -174,118 +172,6 @@ public class PlaceSelection implements DownloadSelection {
         tblSearchResults.clearSelection();
     }
 
-    /**
-     * Data storage for search results.
-     */
-    private static class SearchResult {
-        public String name;
-        public String info;
-        public String nearestPlace;
-        public String description;
-        public double lat;
-        public double lon;
-        public int zoom;
-        public Bounds bounds;
-
-        public Bounds getDownloadArea() {
-            return bounds != null ? bounds : OsmUrlToBounds.positionToBounds(lat, lon, zoom);
-        }
-    }
-
-    /**
-     * A very primitive parser for the name finder's output.
-     * Structure of xml described here:  http://wiki.openstreetmap.org/index.php/Name_finder
-     *
-     */
-    private static class NameFinderResultParser extends DefaultHandler {
-        private SearchResult currentResult;
-        private StringBuilder description;
-        private int depth;
-        private final List<SearchResult> data = new LinkedList<>();
-
-        /**
-         * Detect starting elements.
-         *
-         */
-        @Override
-        public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
-        throws SAXException {
-            depth++;
-            try {
-                if ("searchresults".equals(qName)) {
-                    // do nothing
-                } else if ("named".equals(qName) && (depth == 2)) {
-                    currentResult = new PlaceSelection.SearchResult();
-                    currentResult.name = atts.getValue("name");
-                    currentResult.info = atts.getValue("info");
-                    if (currentResult.info != null) {
-                        currentResult.info = tr(currentResult.info);
-                    }
-                    currentResult.lat = Double.parseDouble(atts.getValue("lat"));
-                    currentResult.lon = Double.parseDouble(atts.getValue("lon"));
-                    currentResult.zoom = Integer.parseInt(atts.getValue("zoom"));
-                    data.add(currentResult);
-                } else if ("description".equals(qName) && (depth == 3)) {
-                    description = new StringBuilder();
-                } else if ("named".equals(qName) && (depth == 4)) {
-                    // this is a "named" place in the nearest places list.
-                    String info = atts.getValue("info");
-                    if ("city".equals(info) || "town".equals(info) || "village".equals(info)) {
-                        currentResult.nearestPlace = atts.getValue("name");
-                    }
-                } else if ("place".equals(qName) && atts.getValue("lat") != null) {
-                    currentResult = new PlaceSelection.SearchResult();
-                    currentResult.name = atts.getValue("display_name");
-                    currentResult.description = currentResult.name;
-                    currentResult.info = atts.getValue("class");
-                    if (currentResult.info != null) {
-                        currentResult.info = tr(currentResult.info);
-                    }
-                    currentResult.nearestPlace = tr(atts.getValue("type"));
-                    currentResult.lat = Double.parseDouble(atts.getValue("lat"));
-                    currentResult.lon = Double.parseDouble(atts.getValue("lon"));
-                    String[] bbox = atts.getValue("boundingbox").split(",");
-                    currentResult.bounds = new Bounds(
-                            Double.parseDouble(bbox[0]), Double.parseDouble(bbox[2]),
-                            Double.parseDouble(bbox[1]), Double.parseDouble(bbox[3]));
-                    data.add(currentResult);
-                }
-            } catch (NumberFormatException x) {
-                Main.error(x); // SAXException does not chain correctly
-                throw new SAXException(x.getMessage(), x);
-            } catch (NullPointerException x) {
-                Main.error(x); // SAXException does not chain correctly
-                throw new SAXException(tr("Null pointer exception, possibly some missing tags."), x);
-            }
-        }
-
-        /**
-         * Detect ending elements.
-         */
-        @Override
-        public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
-            if ("description".equals(qName) && description != null) {
-                currentResult.description = description.toString();
-                description = null;
-            }
-            depth--;
-        }
-
-        /**
-         * Read characters for description.
-         */
-        @Override
-        public void characters(char[] data, int start, int length) throws SAXException {
-            if (description != null) {
-                description.append(data, start, length);
-            }
-        }
-
-        public List<SearchResult> getResult() {
-            return data;
-        }
-    }
-
     class SearchAction extends AbstractAction implements DocumentListener {
 
         SearchAction() {
@@ -375,10 +261,7 @@ public class PlaceSelection implements DownloadSelection {
                     connection.connect();
                 }
                 try (Reader reader = connection.getResponse().getContentReader()) {
-                    InputSource inputSource = new InputSource(reader);
-                    NameFinderResultParser parser = new NameFinderResultParser();
-                    Utils.parseSafeSAX(inputSource, parser);
-                    this.data = parser.getResult();
+                    data = NameFinder.parseSearchResults(reader);
                 }
             } catch (SAXParseException e) {
                 if (!canceled) {
@@ -561,24 +444,24 @@ public class PlaceSelection implements DownloadSelection {
             SearchResult sr = (SearchResult) value;
             switch(column) {
             case 0:
-                setText(sr.name);
+                setText(sr.getName());
                 break;
             case 1:
-                setText(sr.info);
+                setText(sr.getInfo());
                 break;
             case 2:
-                setText(sr.nearestPlace);
+                setText(sr.getNearestPlace());
                 break;
             case 3:
-                if (sr.bounds != null) {
-                    setText(sr.bounds.toShortString(new DecimalFormat("0.000")));
+                if (sr.getBounds() != null) {
+                    setText(sr.getBounds().toShortString(new DecimalFormat("0.000")));
                 } else {
-                    setText(sr.zoom != 0 ? Integer.toString(sr.zoom) : tr("unknown"));
+                    setText(sr.getZoom() != 0 ? Integer.toString(sr.getZoom()) : tr("unknown"));
                 }
                 break;
             default: // Do nothing
             }
-            setToolTipText(lineWrapDescription(sr.description));
+            setToolTipText(lineWrapDescription(sr.getDescription()));
             return this;
         }
     }
diff --git a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
index 1bc651b..3a9301b 100644
--- a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
+++ b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
@@ -1,14 +1,24 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.draw;
 
+import java.awt.BasicStroke;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.geom.PathIterator;
+
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapViewState;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
+import org.openstreetmap.josm.gui.MapViewState.MapViewRectangle;
+
 
 /**
  * This is a version of a java Path2D that allows you to add points to it by simply giving their east/north, lat/lon or node coordinates.
+ * <p>
+ * It is possible to clip the part of the path that is outside the view. This is useful when drawing dashed lines. Those lines use up a lot of
+ * performance if the zoom level is high and the part outside the view is long. See {@link #computeClippedLine(Stroke)}.
  * @author Michael Zangl
  * @since 10875
  */
@@ -60,6 +70,8 @@ public class MapViewPath extends MapPath2D {
 
     /**
      * Draw a line to the node.
+     * <p>
+     * line clamping to view is done automatically.
      * @param n The node
      * @return this for easy chaining.
      */
@@ -70,6 +82,8 @@ public class MapViewPath extends MapPath2D {
 
     /**
      * Draw a line to the position.
+     * <p>
+     * line clamping to view is done automatically.
      * @param eastNorth The position
      * @return this for easy chaining.
      */
@@ -154,4 +168,182 @@ public class MapViewPath extends MapPath2D {
             lineTo(first);
         }
     }
+
+    /**
+     * Compute a line that is similar to the current path expect for that parts outside the screen are skipped using moveTo commands.
+     *
+     * The line is computed in a way that dashes stay in their place when moving the view.
+     *
+     * The resulting line is not intended to fill areas.
+     * @param stroke The stroke to compute the line for.
+     * @return The new line shape.
+     * @since 11147
+     */
+    public Shape computeClippedLine(Stroke stroke) {
+        MapPath2D clamped = new MapPath2D();
+        if (visitClippedLine(stroke, (inLineOffset, start, end, startIsOldEnd) -> {
+            if (!startIsOldEnd) {
+                clamped.moveTo(start);
+            }
+            clamped.lineTo(end);
+        })) {
+            return clamped;
+        } else {
+            // could not clip the path.
+            return this;
+        }
+    }
+
+    /**
+     * Visits all straight segments of this path. The segments are clamped to the view.
+     * If they are clamped, the start points are aligned with the pattern.
+     * @param stroke The stroke to take the dash information from.
+     * @param consumer The consumer to call for each segment
+     * @return false if visiting the path failed because there e.g. were non-straight segments.
+     * @since 11147
+     */
+    public boolean visitClippedLine(Stroke stroke, PathSegmentConsumer consumer) {
+        if (stroke instanceof BasicStroke && ((BasicStroke) stroke).getDashArray() != null) {
+            float length = 0;
+            for (float f : ((BasicStroke) stroke).getDashArray()) {
+                length += f;
+            }
+            return visitClippedLine(((BasicStroke) stroke).getDashPhase(), length, consumer);
+        } else {
+            return visitClippedLine(0, 0, consumer);
+        }
+    }
+
+    /**
+     * Visits all straight segments of this path. The segments are clamped to the view.
+     * If they are clamped, the start points are aligned with the pattern.
+     * @param strokeOffset The initial offset of the pattern
+     * @param strokeLength The dash pattern length. 0 to use no pattern.
+     * @param consumer The consumer to call for each segment
+     * @return false if visiting the path failed because there e.g. were non-straight segments.
+     * @since 11147
+     */
+    public boolean visitClippedLine(double strokeOffset, double strokeLength, PathSegmentConsumer consumer) {
+        return new ClampingPathVisitor(state.getViewClipRectangle(), strokeOffset, strokeLength, consumer)
+            .visit(this);
+    }
+
+
+    /**
+     * This class is used to visit the segments of this path.
+     * @author Michael Zangl
+     * @since 11147
+     */
+    public interface PathSegmentConsumer {
+
+        /**
+         * Add a line segment between two points
+         * @param inLineOffset The offset of start in the line
+         * @param start The start point
+         * @param end The end point
+         * @param startIsOldEnd If the start point equals the last end point.
+         */
+        void addLineBetween(double inLineOffset, MapViewPoint start, MapViewPoint end, boolean startIsOldEnd);
+
+    }
+
+    private class ClampingPathVisitor {
+        private final MapViewRectangle clip;
+        private final PathSegmentConsumer consumer;
+        protected double strokeProgress;
+        private final double strokeLength;
+        private MapViewPoint lastMoveTo;
+
+        private MapViewPoint cursor;
+        private boolean cursorIsActive = false;
+
+        /**
+         * Create a new {@link ClampingPathVisitor}
+         * @param clip View clip rectangle
+         * @param strokeOffset Initial stroke offset
+         * @param strokeLength Total length of a stroke sequence
+         * @param consumer The consumer to notify of the path segments.
+         */
+        ClampingPathVisitor(MapViewRectangle clip, double strokeOffset, double strokeLength, PathSegmentConsumer consumer) {
+            this.clip = clip;
+            this.strokeProgress = Math.min(strokeLength - strokeOffset, 0);
+            this.strokeLength = strokeLength;
+            this.consumer = consumer;
+        }
+
+        /**
+         * Append a path to this one. The path is clipped to the current view.
+         * @param mapViewPath The iterator
+         * @return true if adding the path was successful.
+         */
+        public boolean visit(MapViewPath mapViewPath) {
+            double[] coords = new double[8];
+            PathIterator it = mapViewPath.getPathIterator(null);
+            while (!it.isDone()) {
+                int type = it.currentSegment(coords);
+                switch (type) {
+                case PathIterator.SEG_CLOSE:
+                    visitClose();
+                    break;
+                case PathIterator.SEG_LINETO:
+                    visitLineTo(coords[0], coords[1]);
+                    break;
+                case PathIterator.SEG_MOVETO:
+                    visitMoveTo(coords[0], coords[1]);
+                    break;
+                default:
+                    // cannot handle this shape - this should be very rare. We let Java2D do the clipping.
+                    return false;
+                }
+                it.next();
+            }
+            return true;
+        }
+
+        void visitClose() {
+            drawLineTo(lastMoveTo);
+        }
+
+        void visitMoveTo(double x, double y) {
+            MapViewPoint point = state.getForView(x, y);
+            lastMoveTo = point;
+            cursor = point;
+            cursorIsActive = false;
+        }
+
+        void visitLineTo(double x, double y) {
+            drawLineTo(state.getForView(x, y));
+        }
+
+        private void drawLineTo(MapViewPoint next) {
+            MapViewPoint entry = clip.getLineEntry(cursor, next);
+            if (entry != null) {
+                MapViewPoint exit = clip.getLineEntry(next, cursor);
+                if (!cursorIsActive || !entry.equals(cursor)) {
+                    entry = alignStrokeOffset(entry, cursor);
+                }
+                consumer.addLineBetween(strokeProgress + cursor.distanceToInView(entry), entry, exit, cursorIsActive);
+                cursorIsActive = exit.equals(next);
+            }
+            strokeProgress += cursor.distanceToInView(next);
+
+            cursor = next;
+        }
+
+        private MapViewPoint alignStrokeOffset(MapViewPoint entry, MapViewPoint originalStart) {
+            double distanceSq = entry.distanceToInViewSq(originalStart);
+            if (distanceSq < 0.01 || strokeLength <= 0.001) {
+                // don't move if there is nothing to move.
+                return entry;
+            }
+
+            double distance = Math.sqrt(distanceSq);
+            double offset = ((strokeProgress + distance)) % strokeLength;
+            if (offset < 0.01) {
+                return entry;
+            }
+
+            return entry.interpolate(originalStart, offset / distance);
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
index 0e71b59..c2b5dc3 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
@@ -13,9 +13,7 @@ import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
@@ -49,6 +47,7 @@ import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
 import org.openstreetmap.josm.gui.widgets.JosmHTMLEditorKit;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
@@ -138,23 +137,15 @@ public class HelpBrowser extends JDialog implements IHelpBrowser {
      */
     protected StyleSheet buildStyleSheet() {
         StyleSheet ss = new StyleSheet();
-        StringBuilder css = new StringBuilder();
-        try (BufferedReader breader = new BufferedReader(
-                new InputStreamReader(
-                        getClass().getResourceAsStream("/data/help-browser.css"), StandardCharsets.UTF_8
-                )
-        )) {
-            String line;
-            while ((line = breader.readLine()) != null) {
-                css.append(line);
-                css.append('\n');
-            }
+        final String css;
+        try (CachedFile cf = new CachedFile("resource://data/help-browser.css")) {
+            css = new String(cf.getByteContent(), StandardCharsets.ISO_8859_1);
         } catch (IOException e) {
             Main.error(tr("Failed to read CSS file ''help-browser.css''. Exception is: {0}", e.toString()));
             Main.error(e);
             return ss;
         }
-        ss.addRule(css.toString());
+        ss.addRule(css);
         return ss;
     }
 
diff --git a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
index 63b5ae4..f0f4cc0 100644
--- a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
@@ -6,6 +6,8 @@ import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -16,6 +18,7 @@ import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
+import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
@@ -334,7 +337,16 @@ public class CoordinateInfoViewer extends JPanel {
 
         MapViewer(HistoryBrowserModel model) {
             this.updater = new Updater(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
+            setTileSource(new OsmTileSource.Mapnik()); // for attribution
             setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
+            addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseClicked(MouseEvent e) {
+                    if (e.getButton() == MouseEvent.BUTTON1) {
+                        getAttribution().handleAttribution(e.getPoint(), true);
+                    }
+                }
+            });
         }
 
         @Override
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
index d245b84..2b46ed1 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
@@ -170,19 +170,7 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
                 if (canceled) {
                     break;
                 }
-                String msg = getLoadingMessage(pid);
-                progressMonitor.indeterminateSubTask(tr(msg, Long.toString(pid.getUniqueId())));
-                reader = null;
-                HistoryDataSet ds;
-                try {
-                    reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId());
-                    ds = loadHistory(reader, progressMonitor);
-                } catch (OsmTransferException e) {
-                    if (canceled)
-                        return;
-                    throw e;
-                }
-                loadedData.mergeInto(ds);
+                loadHistory(pid);
             }
         } catch (OsmTransferException e) {
             lastException = e;
@@ -190,6 +178,22 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
         }
     }
 
+    private void loadHistory(PrimitiveId pid) throws OsmTransferException {
+        String msg = getLoadingMessage(pid);
+        progressMonitor.indeterminateSubTask(tr(msg, Long.toString(pid.getUniqueId())));
+        reader = null;
+        HistoryDataSet ds;
+        try {
+            reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId());
+            ds = loadHistory(reader, progressMonitor);
+        } catch (OsmTransferException e) {
+            if (canceled)
+                return;
+            throw e;
+        }
+        loadedData.mergeInto(ds);
+    }
+
     protected static HistoryDataSet loadHistory(OsmServerHistoryReader reader, ProgressMonitor progressMonitor) throws OsmTransferException {
         HistoryDataSet ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
         if (ds != null) {
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java b/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
index fc8ff6e..9abf9cc 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
@@ -116,7 +116,7 @@ public class DownloadFileTask extends PleaseWaitRunnable {
                 InputStream in = downloadConnection.getResponse().getContent();
                 OutputStream out = new FileOutputStream(file)
             ) {
-                byte[] buffer = new byte[32768];
+                byte[] buffer = new byte[32_768];
                 int count = 0;
                 long p1 = 0;
                 long p2;
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
index 3fcea67..86cbd4c 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
@@ -4,7 +4,9 @@ package org.openstreetmap.josm.gui.io;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 
 import javax.swing.JOptionPane;
@@ -58,16 +60,15 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
     @Override
     protected void finish() {
         if (JosmUserIdentityManager.getInstance().isAnonymous()) {
-            JOptionPane.showMessageDialog(
-                    GuiHelper.getFrameForComponent(parent),
-                    "<html>" + tr("Could not retrieve the list of your open changesets because<br>"
-                            + "JOSM does not know your identity.<br>"
-                            + "You have either chosen to work anonymously or you are not entitled<br>"
-                            + "to know the identity of the user on whose behalf you are working.")
-                            + "</html>",
-                            tr("Missing user identity"),
-                            JOptionPane.ERROR_MESSAGE
-            );
+            String msg = tr("Could not retrieve the list of your open changesets because<br>"
+                    + "JOSM does not know your identity.<br>"
+                    + "You have either chosen to work anonymously or you are not entitled<br>"
+                    + "to know the identity of the user on whose behalf you are working.");
+            Main.warn(msg);
+            if (!GraphicsEnvironment.isHeadless()) {
+                JOptionPane.showMessageDialog(GuiHelper.getFrameForComponent(parent),
+                        "<html>" + msg + "</html>", tr("Missing user identity"), JOptionPane.ERROR_MESSAGE);
+            }
             return;
         }
         if (canceled) return;
@@ -152,7 +153,20 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
         }
     }
 
+    /**
+     * Determines if this task has been cancelled.
+     * @return {@code true} if this task has been cancelled
+     */
     public boolean isCanceled() {
         return canceled;
     }
+
+    /**
+     * Returns the changesets.
+     * @return the changesets, or {@code null}
+     * @since 11110
+     */
+    public final List<Changeset> getChangesets() {
+        return changesets != null ? Collections.unmodifiableList(changesets) : null;
+    }
 }
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
index 6ad4d90..d498627 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
@@ -18,6 +18,7 @@ import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
@@ -46,6 +47,7 @@ import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.io.SaveLayersModel.Mode;
 import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.progress.SwingRenderingProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -57,7 +59,20 @@ import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
 public class SaveLayersDialog extends JDialog implements TableModelListener {
-    public enum UserAction {
+
+    /**
+     * The cause for requesting an action on unsaved modifications
+     */
+    public enum Reason {
+        /** deleting a layer */
+        DELETE,
+        /** exiting JOSM */
+        EXIT,
+        /* restarting JOSM */
+        RESTART
+    }
+
+    private enum UserAction {
         /** save/upload layers was successful, proceed with operation */
         PROCEED,
         /** save/upload of layers was not successful or user canceled operation */
@@ -77,6 +92,46 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
     private final JButton saveAndProceedActionButton = new JButton(saveAndProceedAction);
 
     /**
+     * Asks user to perform "save layer" operations (save on disk and/or upload data to server) before data layers deletion.
+     *
+     * @param selectedLayers The layers to check. Only instances of {@link AbstractModifiableLayer} are considered.
+     * @param reason the cause for requesting an action on unsaved modifications
+     * @return {@code true} if there was nothing to save, or if the user wants to proceed to save operations.
+     *         {@code false} if the user cancels.
+     * @since 11093
+     */
+    public static boolean saveUnsavedModifications(Iterable<? extends Layer> selectedLayers, Reason reason) {
+        if (!GraphicsEnvironment.isHeadless()) {
+            SaveLayersDialog dialog = new SaveLayersDialog(Main.parent);
+            List<AbstractModifiableLayer> layersWithUnmodifiedChanges = new ArrayList<>();
+            for (Layer l: selectedLayers) {
+                if (!(l instanceof AbstractModifiableLayer)) {
+                    continue;
+                }
+                AbstractModifiableLayer odl = (AbstractModifiableLayer) l;
+                if (odl.isModified() &&
+                        ((!odl.isSavable() && !odl.isUploadable()) ||
+                                odl.requiresSaveToFile() ||
+                                (odl.requiresUploadToServer() && !odl.isUploadDiscouraged()))) {
+                    layersWithUnmodifiedChanges.add(odl);
+                }
+            }
+            dialog.prepareForSavingAndUpdatingLayers(reason);
+            if (!layersWithUnmodifiedChanges.isEmpty()) {
+                dialog.getModel().populate(layersWithUnmodifiedChanges);
+                dialog.setVisible(true);
+                switch(dialog.getUserAction()) {
+                    case PROCEED: return true;
+                    case CANCEL:
+                    default: return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
      * Constructs a new {@code SaveLayersDialog}.
      * @param parent parent component
      */
@@ -130,16 +185,20 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
         return pnl2;
     }
 
-    public void prepareForSavingAndUpdatingLayersBeforeExit() {
-        setTitle(tr("Unsaved changes - Save/Upload before exiting?"));
-        this.saveAndProceedAction.initForSaveAndExit();
-        this.discardAndProceedAction.initForDiscardAndExit();
-    }
-
-    public void prepareForSavingAndUpdatingLayersBeforeDelete() {
-        setTitle(tr("Unsaved changes - Save/Upload before deleting?"));
-        this.saveAndProceedAction.initForSaveAndDelete();
-        this.discardAndProceedAction.initForDiscardAndDelete();
+    public void prepareForSavingAndUpdatingLayers(final Reason reason) {
+        switch (reason) {
+            case EXIT:
+                setTitle(tr("Unsaved changes - Save/Upload before exiting?"));
+                break;
+            case DELETE:
+                setTitle(tr("Unsaved changes - Save/Upload before deleting?"));
+                break;
+            case RESTART:
+                setTitle(tr("Unsaved changes - Save/Upload before restarting?"));
+                break;
+        }
+        this.saveAndProceedAction.initForReason(reason);
+        this.discardAndProceedAction.initForReason(reason);
     }
 
     public UserAction getUserAction() {
@@ -171,7 +230,7 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
         LayerListWarningMessagePanel(String msg, List<SaveLayerInfo> infos) {
             build();
             lblMessage.setText(msg);
-            lstLayers.setListData(infos.toArray(new SaveLayerInfo[0]));
+            lstLayers.setListData(infos.toArray(new SaveLayerInfo[infos.size()]));
         }
 
         protected void build() {
@@ -322,19 +381,28 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
 
     class DiscardAndProceedAction extends AbstractAction implements PropertyChangeListener {
         DiscardAndProceedAction() {
-            initForDiscardAndExit();
+            initForReason(Reason.EXIT);
         }
 
-        public void initForDiscardAndExit() {
-            putValue(NAME, tr("Exit now!"));
-            putValue(SHORT_DESCRIPTION, tr("Exit JOSM without saving. Unsaved changes are lost."));
-            putValue(SMALL_ICON, ImageProvider.get("exit"));
-        }
+        public void initForReason(Reason reason) {
+            switch (reason) {
+                case EXIT:
+                    putValue(NAME, tr("Exit now!"));
+                    putValue(SHORT_DESCRIPTION, tr("Exit JOSM without saving. Unsaved changes are lost."));
+                    putValue(SMALL_ICON, ImageProvider.get("exit"));
+                    break;
+                case RESTART:
+                    putValue(NAME, tr("Restart now!"));
+                    putValue(SHORT_DESCRIPTION, tr("Restart JOSM without saving. Unsaved changes are lost."));
+                    putValue(SMALL_ICON, ImageProvider.get("restart"));
+                    break;
+                case DELETE:
+                    putValue(NAME, tr("Delete now!"));
+                    putValue(SHORT_DESCRIPTION, tr("Delete layers without saving. Unsaved changes are lost."));
+                    putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+                    break;
+            }
 
-        public void initForDiscardAndDelete() {
-            putValue(NAME, tr("Delete now!"));
-            putValue(SHORT_DESCRIPTION, tr("Delete layers without saving. Unsaved changes are lost."));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
         }
 
         @Override
@@ -384,20 +452,27 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
         private final transient Image upldDis = new ImageProvider("upload").setDisabled(true).get().getImage();
 
         SaveAndProceedAction() {
-            initForSaveAndExit();
-        }
-
-        public void initForSaveAndExit() {
-            putValue(NAME, tr("Perform actions before exiting"));
-            putValue(SHORT_DESCRIPTION, tr("Exit JOSM with saving. Unsaved changes are uploaded and/or saved."));
-            putValue(BASE_ICON, ImageProvider.get("exit"));
-            redrawIcon();
+            initForReason(Reason.EXIT);
         }
 
-        public void initForSaveAndDelete() {
-            putValue(NAME, tr("Perform actions before deleting"));
-            putValue(SHORT_DESCRIPTION, tr("Save/Upload layers before deleting. Unsaved changes are not lost."));
-            putValue(BASE_ICON, ImageProvider.get("dialogs", "delete"));
+        public void initForReason(Reason reason) {
+            switch (reason) {
+                case EXIT:
+                    putValue(NAME, tr("Perform actions before exiting"));
+                    putValue(SHORT_DESCRIPTION, tr("Exit JOSM with saving. Unsaved changes are uploaded and/or saved."));
+                    putValue(BASE_ICON, ImageProvider.get("exit"));
+                    break;
+                case RESTART:
+                    putValue(NAME, tr("Perform actions before restarting"));
+                    putValue(SHORT_DESCRIPTION, tr("Restart JOSM with saving. Unsaved changes are uploaded and/or saved."));
+                    putValue(BASE_ICON, ImageProvider.get("restart"));
+                    break;
+                case DELETE:
+                    putValue(NAME, tr("Perform actions before deleting"));
+                    putValue(SHORT_DESCRIPTION, tr("Save/Upload layers before deleting. Unsaved changes are not lost."));
+                    putValue(BASE_ICON, ImageProvider.get("dialogs", "delete"));
+                    break;
+            }
             redrawIcon();
         }
 
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java
index 1b2e620..c082ce8 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java
@@ -112,7 +112,11 @@ public abstract class AbstractCachedTileSourceLayer<T extends AbstractTMSTileSou
      * @return factory returning cached tile loaders using specified cache and TileLoaders
      */
     public static TileLoaderFactory getTileLoaderFactory(String name, Class<? extends TileLoader> klazz) {
-        return new CachedTileLoaderFactory(getCache(name), klazz);
+        CacheAccess<String, BufferedImageCacheEntry> cache = getCache(name);
+        if (cache == null) {
+            return null;
+        }
+        return new CachedTileLoaderFactory(cache, klazz);
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
index 7f02967..eb4fda2 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
@@ -41,7 +41,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import javax.swing.AbstractAction;
@@ -86,13 +85,14 @@ import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapViewState.MapViewRectangle;
 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings.FilterChangeListener;
 import org.openstreetmap.josm.gui.layer.imagery.TileCoordinateConverter;
+import org.openstreetmap.josm.gui.layer.imagery.TilePosition;
+import org.openstreetmap.josm.gui.layer.imagery.TileRange;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings.DisplaySettingsChangeEvent;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings.DisplaySettingsChangeListener;
@@ -106,7 +106,6 @@ import org.openstreetmap.josm.tools.MemoryManager.NotEnoughMemoryException;
 
 /**
  * Base abstract class that supports displaying images provided by TileSource. It might be TMS source, WMS or WMTS
- *
  * It implements all standard functions of tilesource based layers: autozoom, tile reloads, layer saving, loading,etc.
  *
  * @author Upliner
@@ -118,10 +117,7 @@ import org.openstreetmap.josm.tools.MemoryManager.NotEnoughMemoryException;
 public abstract class AbstractTileSourceLayer<T extends AbstractTMSTileSource> extends ImageryLayer
 implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeListener, DisplaySettingsChangeListener {
     private static final String PREFERENCE_PREFIX = "imagery.generic";
-    /**
-     * Registers all setting properties
-     */
-    static {
+    static { // Registers all setting properties
         new TileSourceDisplaySettings();
     }
 
@@ -131,16 +127,16 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     public static final int MIN_ZOOM = 2;
     private static final Font InfoFont = new Font("sansserif", Font.BOLD, 13);
 
+    /** additional layer menu actions */
+    private static List<MenuAddition> menuAdditions = new LinkedList<>();
+
     /** minimum zoom level to show to user */
     public static final IntegerProperty PROP_MIN_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".min_zoom_lvl", 2);
     /** maximum zoom level to show to user */
     public static final IntegerProperty PROP_MAX_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".max_zoom_lvl", 20);
 
     //public static final BooleanProperty PROP_DRAW_DEBUG = new BooleanProperty(PREFERENCE_PREFIX + ".draw_debug", false);
-    /**
-     * Zoomlevel at which tiles is currently downloaded.
-     * Initial zoom lvl is set to bestZoom
-     */
+    /** Zoomlevel at which tiles is currently downloaded. Initial zoom lvl is set to bestZoom */
     public int currentZoomLevel;
 
     private final AttributionSupport attribution = new AttributionSupport();
@@ -163,9 +159,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     protected T tileSource;
     protected TileLoader tileLoader;
 
-    /**
-     * A timer that is used to delay invalidation events if required.
-     */
+    /** A timer that is used to delay invalidation events if required. */
     private final Timer invalidateLaterTimer = new Timer(100, e -> this.invalidate());
 
     private final MouseAdapter adapter = new MouseAdapter() {
@@ -225,12 +219,12 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     protected abstract TileLoaderFactory getTileLoaderFactory();
 
     /**
+     * Creates and returns a new {@link TileSource} instance depending on {@link #info} specified in the constructor.
      *
-     * @param info imagery info
      * @return TileSource for specified ImageryInfo
      * @throws IllegalArgumentException when Imagery is not supported by layer
      */
-    protected abstract T getTileSource(ImageryInfo info);
+    protected abstract T getTileSource();
 
     protected Map<String, String> getHeaders(T tileSource) {
         if (tileSource instanceof TemplatedTileSource) {
@@ -283,8 +277,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
      * Clears the tile cache.
      *
      * If the current tileLoader is an instance of OsmTileLoader, a new
-     * TmsTileClearController is created and passed to the according clearCache
-     * method.
+     * TmsTileClearController is created and passed to the according clearCache method.
      *
      * @param monitor not used in this implementation - as cache clear is instaneus
      */
@@ -386,7 +379,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
          * is for working with overzoomed tiles (big, pixelated), which is good when working with high-dpi screens and/or
          * maps as a imagery layer
          */
-
         int intResult = (int) Math.round(result + 1 + ZOOM_OFFSET.get() / 1.9);
 
         intResult = Math.min(intResult, getMaxZoomLvl());
@@ -405,8 +397,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         }
 
         private String getSizeString(int size) {
-            StringBuilder ret = new StringBuilder();
-            return ret.append(size).append('x').append(size).toString();
+            return new StringBuilder().append(size).append('x').append(size).toString();
         }
 
         private JTextField createTextField(String text) {
@@ -622,7 +613,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     private class FlushTileCacheAction extends AbstractAction {
         FlushTileCacheAction() {
             super(tr("Flush tile cache"));
-            setEnabled(tileLoader instanceof CachedTileLoader);
         }
 
         @Override
@@ -666,8 +656,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
      */
     @Override
     public void hookUpMapView() {
-        // this needs to be here and not in constructor to allow empty TileSource class construction
-        // using SessionWriter
+        // this needs to be here and not in constructor to allow empty TileSource class construction using SessionWriter
         initializeIfRequired();
 
         super.hookUpMapView();
@@ -684,8 +673,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
             event.getMapView().setNativeScaleLayer((NativeScaleLayer) this);
         }
 
-        // FIXME: why do we need this? Without this, if you add a WMS layer and do not move the mouse, sometimes, tiles do not
-        // start loading.
+        // FIXME: why do we need this? Without this, if you add a WMS layer and do not move the mouse, sometimes, tiles do not start loading.
         // FIXME: Check if this is still required.
         event.getMapView().repaint(500);
 
@@ -694,7 +682,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
 
     private void initializeIfRequired() {
         if (tileSource == null) {
-            tileSource = getTileSource(info);
+            tileSource = getTileSource();
             if (tileSource == null) {
                 throw new IllegalArgumentException(tr("Failed to create tile source"));
             }
@@ -948,9 +936,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     }
 
     /*
-     * We use these for quick, hackish calculations.  They
-     * are temporary only and intentionally not inserted
-     * into the tileCache.
+     * We use these for quick, hackish calculations. They are temporary only and intentionally not inserted into the tileCache.
      */
     private Tile tempCornerTile(Tile t) {
         int x = t.getXtile() + 1;
@@ -1010,9 +996,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     }
 
     private TileSet getVisibleTileSet() {
-        MapView mv = Main.map.mapView;
-        MapViewRectangle area = mv.getState().getViewArea();
-        ProjectionBounds bounds = area.getProjectionBounds();
+        ProjectionBounds bounds = Main.map.mapView.getState().getViewArea().getProjectionBounds();
         return getTileSet(bounds.getMin(), bounds.getMax(), currentZoomLevel);
     }
 
@@ -1084,17 +1068,14 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         return img;
     }
 
-    // 'source' is the pixel coordinates for the area that
-    // the img is capable of filling in.  However, we probably
-    // only want a portion of it.
+    // 'source' is the pixel coordinates for the area that the img is capable of filling in.
+    // However, we probably only want a portion of it.
     //
-    // 'border' is the screen cordinates that need to be drawn.
-    //  We must not draw outside of it.
+    // 'border' is the screen cordinates that need to be drawn. We must not draw outside of it.
     private void drawImageInside(Graphics g, Image sourceImg, Rectangle2D source, Rectangle2D border) {
         Rectangle2D target = source;
 
-        // If a border is specified, only draw the intersection
-        // if what we have combined with what we are supposed to draw.
+        // If a border is specified, only draw the intersection if what we have combined with what we are supposed to draw.
         if (border != null) {
             target = source.createIntersection(border);
             if (Main.isDebugEnabled()) {
@@ -1102,10 +1083,8 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
             }
         }
 
-        // All of the rectangles are in screen coordinates.  We need
-        // to how these correlate to the sourceImg pixels.  We could
-        // avoid doing this by scaling the image up to the 'source' size,
-        // but this should be cheaper.
+        // All of the rectangles are in screen coordinates. We need to how these correlate to the sourceImg pixels.
+        // We could avoid doing this by scaling the image up to the 'source' size, but this should be cheaper.
         //
         // In some projections, x any y are scaled differently enough to
         // cause a pixel or two of fudge.  Calculate them separately.
@@ -1159,23 +1138,20 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         return missed.stream().map(this::getOrCreateTile).collect(Collectors.toList());
     }
 
-    // This function is called for several zoom levels, not just
-    // the current one.  It should not trigger any tiles to be
-    // downloaded.  It should also avoid polluting the tile cache
-    // with any tiles since these tiles are not mandatory.
+    // This function is called for several zoom levels, not just the current one.
+    // It should not trigger any tiles to be downloaded.
+    // It should also avoid polluting the tile cache with any tiles since these tiles are not mandatory.
     //
-    // The "border" tile tells us the boundaries of where we may
-    // draw.  It will not be from the zoom level that is being
-    // drawn currently.  If drawing the displayZoomLevel,
-    // border is null and we draw the entire tile set.
+    // The "border" tile tells us the boundaries of where we may drawn.
+    // It will not be from the zoom level that is being drawn currently.
+    // If drawing the displayZoomLevel, border is null and we draw the entire tile set.
     private List<Tile> paintTileImages(Graphics g, TileSet ts, int zoom, Tile border) {
         if (zoom <= 0) return Collections.emptyList();
         Rectangle2D borderRect = coordinateConverter.getRectangleForTile(border);
         List<Tile> missedTiles = new LinkedList<>();
-        // The callers of this code *require* that we return any tiles
-        // that we do not draw in missedTiles.  ts.allExistingTiles() by
-        // default will only return already-existing tiles.  However, we
-        // need to return *all* tiles to the callers, so force creation here.
+        // The callers of this code *require* that we return any tiles that we do not draw in missedTiles.
+        // ts.allExistingTiles() by default will only return already-existing tiles.
+        // However, we need to return *all* tiles to the callers, so force creation here.
         for (Tile tile : ts.allTilesCreate()) {
             Image img = getLoadedTileImage(tile);
             if (img == null || tile.hasError()) {
@@ -1242,9 +1218,9 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
                 myDrawString(g, "x=" + t.getXtile() / 32 + " y=" + t.getYtile() / 32 + " z=7", p.x + 2, texty);
                 texty += 1 + fontHeight;
             }
-        }*/
+        }
 
-        /*String tileStatus = tile.getStatus();
+        String tileStatus = tile.getStatus();
         if (!tile.isLoaded() && PROP_DRAW_DEBUG.get()) {
             myDrawString(g, tr("image " + tileStatus), p.x + 2, texty);
             texty += 1 + fontHeight;
@@ -1291,102 +1267,8 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         return getShiftedLatLon(Main.getProjection().latlon2eastNorth(new LatLon(latLon)));
     }
 
-
     private final TileSet nullTileSet = new TileSet();
 
-    /**
-     * This is a rectangular range of tiles.
-     */
-    private static class TileRange {
-        int minX;
-        int maxX;
-        int minY;
-        int maxY;
-        int zoom;
-
-        private TileRange() {
-        }
-
-        protected TileRange(TileXY t1, TileXY t2, int zoom) {
-            minX = (int) Math.floor(Math.min(t1.getX(), t2.getX()));
-            minY = (int) Math.floor(Math.min(t1.getY(), t2.getY()));
-            maxX = (int) Math.ceil(Math.max(t1.getX(), t2.getX()));
-            maxY = (int) Math.ceil(Math.max(t1.getY(), t2.getY()));
-            this.zoom = zoom;
-        }
-
-        protected double tilesSpanned() {
-            return Math.sqrt(1.0 * this.size());
-        }
-
-        protected int size() {
-            int xSpan = maxX - minX + 1;
-            int ySpan = maxY - minY + 1;
-            return xSpan * ySpan;
-        }
-
-        /**
-         * Gets a stream of all tile positions in this set
-         * @return A stream of all positions
-         */
-        public Stream<TilePosition> tilePositions() {
-            if (zoom == 0) {
-                return Stream.empty();
-            } else {
-                return IntStream.rangeClosed(minX, maxX).mapToObj(
-                        x -> IntStream.rangeClosed(minY, maxY).mapToObj(y -> new TilePosition(x, y, zoom))
-                        ).flatMap(Function.identity());
-            }
-        }
-    }
-
-    /**
-     * The position of a single tile.
-     * @author Michael Zangl
-     * @since xxx
-     */
-    private static class TilePosition {
-        private final int x;
-        private final int y;
-        private final int zoom;
-        TilePosition(int x, int y, int zoom) {
-            super();
-            this.x = x;
-            this.y = y;
-            this.zoom = zoom;
-        }
-
-        TilePosition(Tile tile) {
-            this(tile.getXtile(), tile.getYtile(), tile.getZoom());
-        }
-
-        /**
-         * @return the x position
-         */
-        public int getX() {
-            return x;
-        }
-
-        /**
-         * @return the y position
-         */
-        public int getY() {
-            return y;
-        }
-
-        /**
-         * @return the zoom
-         */
-        public int getZoom() {
-            return zoom;
-        }
-
-        @Override
-        public String toString() {
-            return "TilePosition [x=" + x + ", y=" + y + ", zoom=" + zoom + "]";
-        }
-    }
-
     private class TileSet extends TileRange {
 
         protected TileSet(TileXY t1, TileXY t2, int zoom) {
@@ -1447,8 +1329,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         @Override
         public Stream<TilePosition> tilePositions() {
             if (this.insane()) {
-                // Tileset is either empty or too large
-                return Stream.empty();
+                return Stream.empty(); // Tileset is either empty or too large
             } else {
                 return super.tilePositions();
             }
@@ -1488,8 +1369,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         }
 
         /**
-         * Call the given paint method for all tiles in this tile set.
-         * <p>
+         * Call the given paint method for all tiles in this tile set.<p>
          * Uses a parallel stream.
          * @param visitor A visitor to call for each tile.
          * @param missed a consumer to call for each missed tile.
@@ -1543,10 +1423,10 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     }
 
     private static class TileSetInfo {
-        public boolean hasVisibleTiles;
-        public boolean hasOverzoomedTiles;
-        public boolean hasLoadingTiles;
-        public boolean hasAllLoadedTiles;
+        boolean hasVisibleTiles;
+        boolean hasOverzoomedTiles;
+        boolean hasLoadingTiles;
+        boolean hasAllLoadedTiles;
     }
 
     private static <S extends AbstractTMSTileSource> TileSetInfo getTileSetInfo(AbstractTileSourceLayer<S>.TileSet ts) {
@@ -1679,12 +1559,9 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         if (displayZoomLevel != zoom) {
             ts = dts.getTileSet(displayZoomLevel);
             if (!dts.getTileSetInfo(displayZoomLevel).hasAllLoadedTiles && displayZoomLevel < zoom) {
-                /*
-                 * if we are showing tiles from lower zoom level, ensure that all tiles are loaded
-                 * as they are few, and should not trash the tile cache
-                 * This is especially needed when dts.getTileSet(zoom).tooLarge() is true and we are
-                 * not loading tiles
-                 */
+                // if we are showing tiles from lower zoom level, ensure that all tiles are loaded as they are few,
+                // and should not trash the tile cache
+                // This is especially needed when dts.getTileSet(zoom).tooLarge() is true and we are not loading tiles
                 ts.loadAllTiles(false);
             }
         }
@@ -1712,12 +1589,9 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
                     continue;
                 }
                 Tile t2 = tempCornerTile(missed);
-                TileSet ts2 = getTileSet(
-                        getShiftedLatLon(tileSource.tileXYToLatLon(missed)),
-                        getShiftedLatLon(tileSource.tileXYToLatLon(t2)),
-                        newzoom);
-                // Instantiating large TileSets is expensive.  If there
-                // are no loaded tiles, don't bother even trying.
+                TileSet ts2 = getTileSet(getShiftedLatLon(tileSource.tileXYToLatLon(missed)),
+                                         getShiftedLatLon(tileSource.tileXYToLatLon(t2)), newzoom);
+                // Instantiating large TileSets is expensive. If there are no loaded tiles, don't bother even trying.
                 if (ts2.allLoadedTiles().isEmpty()) {
                     newlyMissedTiles.add(missed);
                     continue;
@@ -1745,7 +1619,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         attribution.paintAttribution(g, mv.getWidth(), mv.getHeight(), getShiftedCoord(min), getShiftedCoord(max),
                 displayZoomLevel, this);
 
-        //g.drawString("currentZoomLevel=" + currentZoomLevel, 120, 120);
         g.setColor(Color.lightGray);
 
         if (ts.insane()) {
@@ -1755,7 +1628,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         } else if (!getDisplaySettings().isAutoZoom() && ts.tooSmall()) {
             myDrawString(g, tr("increase tiles zoom level (change resolution) to see more detail"), 120, 120);
         }
-
         if (noTilesAtZoom) {
             myDrawString(g, tr("No tiles at this zoom level"), 120, 120);
         }
@@ -1766,9 +1638,8 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
             myDrawString(g, tr("Best zoom: {0}", getBestZoom()), 50, 185);
             myDrawString(g, tr("Estimated cache size: {0}", estimateTileCacheSize()), 50, 200);
             if (tileLoader instanceof TMSCachedTileLoader) {
-                TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
                 int offset = 200;
-                for (String part: cachedTileLoader.getStats().split("\n")) {
+                for (String part: ((TMSCachedTileLoader) tileLoader).getStats().split("\n")) {
                     offset += 15;
                     myDrawString(g, tr("Cache stats: {0}", part), 50, offset);
                 }
@@ -1791,8 +1662,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         Point clicked = new Point(px, py);
         EastNorth topLeft = mv.getEastNorth(0, 0);
         EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
-        int z = currentZoomLevel;
-        TileSet ts = getTileSet(topLeft, botRight, z);
+        TileSet ts = getTileSet(topLeft, botRight, currentZoomLevel);
 
         if (!ts.tooLarge()) {
             ts.loadAllTiles(false); // make sure there are tile objects for all tiles
@@ -1806,16 +1676,84 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         return clickedTiles.findAny().orElse(null);
     }
 
+    /**
+     * Class to store a menu action and the class it belongs to.
+     */
+    private static class MenuAddition {
+        final Action addition;
+        @SuppressWarnings("rawtypes")
+        final Class<? extends AbstractTileSourceLayer> clazz;
+
+        @SuppressWarnings("rawtypes")
+        MenuAddition(Action addition, Class<? extends AbstractTileSourceLayer> clazz) {
+            this.addition = addition;
+            this.clazz = clazz;
+        }
+    }
+
+    /**
+     * Register an additional layer context menu entry.
+     *
+     * @param addition additional menu action
+     * @since 11197
+     */
+    public static void registerMenuAddition(Action addition) {
+        menuAdditions.add(new MenuAddition(addition, AbstractTileSourceLayer.class));
+    }
+
+    /**
+     * Register an additional layer context menu entry for a imagery layer
+     * class.  The menu entry is valid for the specified class and subclasses
+     * thereof only.
+     * <p>
+     * Example:
+     * <pre>
+     * TMSLayer.registerMenuAddition(new TMSSpecificAction(), TMSLayer.class);
+     * </pre>
+     *
+     * @param addition additional menu action
+     * @param clazz class the menu action is registered for
+     * @since 11197
+     */
+    public static void registerMenuAddition(Action addition,
+                                            Class<? extends AbstractTileSourceLayer<?>> clazz) {
+        menuAdditions.add(new MenuAddition(addition, clazz));
+    }
+
+    /**
+     * Prepare list of additional layer context menu entries.  The list is
+     * empty if there are no additional menu entries.
+     *
+     * @return list of additional layer context menu entries
+     */
+    private List<Action> getMenuAdditions() {
+        final LinkedList<Action> menuAdds = new LinkedList<>();
+        for (MenuAddition menuAdd: menuAdditions) {
+            if (menuAdd.clazz.isInstance(this)) {
+                menuAdds.add(menuAdd.addition);
+            }
+        }
+        if (!menuAdds.isEmpty()) {
+            menuAdds.addFirst(SeparatorLayerAction.INSTANCE);
+        }
+        return menuAdds;
+    }
+
     @Override
     public Action[] getMenuEntries() {
         ArrayList<Action> actions = new ArrayList<>();
         actions.addAll(Arrays.asList(getLayerListEntries()));
         actions.addAll(Arrays.asList(getCommonEntries()));
+        actions.addAll(getMenuAdditions());
         actions.add(SeparatorLayerAction.INSTANCE);
         actions.add(new LayerListPopup.InfoAction(this));
         return actions.toArray(new Action[actions.size()]);
     }
 
+    /**
+     * Returns the contextual menu entries in layer list dialog.
+     * @return the contextual menu entries in layer list dialog
+     */
     public Action[] getLayerListEntries() {
         return new Action[] {
             LayerListDialog.getInstance().createActivateLayerAction(this),
@@ -1863,8 +1801,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
 
     @Override
     public boolean isChanged() {
-        // we use #invalidate()
-        return false;
+        return false; // we use #invalidate()
     }
 
     /**
@@ -1949,7 +1886,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         final Set<Tile> requestedTiles = new ConcurrentSkipListSet<>(
                 (o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.getKey(), o2.getKey()));
         for (LatLon point: points) {
-
             TileXY minTile = tileSource.latLonToTileXY(point.lat() - bufferY, point.lon() - bufferX, currentZoomLevel);
             TileXY curTile = tileSource.latLonToTileXY(point.toCoordinate(), currentZoomLevel);
             TileXY maxTile = tileSource.latLonToTileXY(point.lat() + bufferY, point.lon() + bufferX, currentZoomLevel);
@@ -1994,9 +1930,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     }
 
     private class TileSourcePainter extends CompatibilityModeLayerPainter {
-        /**
-         * The memory handle that will hold our tile source.
-         */
+        /** The memory handle that will hold our tile source. */
         private MemoryHandle<?> memory;
 
         @Override
@@ -2008,9 +1942,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
         }
 
         private void doPaint(MapViewGraphics graphics) {
-            ProjectionBounds pb = graphics.getClipBounds().getProjectionBounds();
-
-            drawInViewArea(graphics.getDefaultGraphics(), graphics.getMapView(), pb);
+            drawInViewArea(graphics.getDefaultGraphics(), graphics.getMapView(), graphics.getClipBounds().getProjectionBounds());
         }
 
         private void allocateCacheMemory() {
diff --git a/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java b/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
index 1d53e28..572228c 100644
--- a/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
+++ b/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
@@ -65,7 +65,7 @@ public class CustomizeColor extends AbstractAction implements LayerAction, Multi
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        Color cl = colors.stream().map(c -> c.get()).filter(Objects::nonNull).findAny().orElse(Color.GRAY);
+        Color cl = colors.stream().map(AbstractProperty::get).filter(Objects::nonNull).findAny().orElse(Color.GRAY);
         JColorChooser c = new JColorChooser(cl);
         Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")};
         int answer = JOptionPane.showOptionDialog(
diff --git a/src/org/openstreetmap/josm/gui/layer/Layer.java b/src/org/openstreetmap/josm/gui/layer/Layer.java
index 9ff3303..93d19d1 100644
--- a/src/org/openstreetmap/josm/gui/layer/Layer.java
+++ b/src/org/openstreetmap/josm/gui/layer/Layer.java
@@ -181,19 +181,6 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
     public abstract Icon getIcon();
 
     /**
-     * Return a Color for this layer. Return null when no color specified.
-     * @param ignoreCustom Custom color should return null, as no default color
-     *      is used. When this is true, then even for custom coloring the base
-     *      color is returned - mainly for layer internal use.
-     * @return layer color
-     * @deprecated Use the new {@link #getColorProperty()}. To be removed end of 2016.
-     */
-    @Deprecated
-    public Color getColor(boolean ignoreCustom) {
-        return null;
-    }
-
-    /**
      * Gets the color property to use for this layer.
      * @return The color property.
      * @since 10824
@@ -618,15 +605,6 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
     }
 
     /**
-     * @return bytes that the tile will use. Needed for resource management
-     * @deprecated Not used any more.
-     */
-    @Deprecated
-    protected long estimateMemoryUsage() {
-        return 0;
-    }
-
-    /**
      * Gets the strategy that specifies where this layer should be inserted in a layer list.
      * @return That strategy.
      * @since 10008
diff --git a/src/org/openstreetmap/josm/gui/layer/LayerManager.java b/src/org/openstreetmap/josm/gui/layer/LayerManager.java
index 489fa88..ec5ee97 100644
--- a/src/org/openstreetmap/josm/gui/layer/LayerManager.java
+++ b/src/org/openstreetmap/josm/gui/layer/LayerManager.java
@@ -9,6 +9,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -20,8 +21,10 @@ import org.openstreetmap.josm.tools.bugreport.BugReport;
  * <p>
  * This manager handles a list of layers with the first layer being the front layer.
  * <h1>Threading</h1>
+ * Synchronization of the layer manager is done by synchronizing all read/write access. All changes are internally done in the EDT thread.
+ *
  * Methods of this manager may be called from any thread in any order.
- * Listeners are called while this layer manager is locked, so they should not block.
+ * Listeners are called while this layer manager is locked, so they should not block on other threads.
  *
  * @author Michael Zangl
  * @since 10273
@@ -34,15 +37,17 @@ public class LayerManager {
         /**
          * Notifies this listener that a layer has been added.
          * <p>
-         * Listeners are called in the EDT thread and you can manipulate the layer manager in the current thread.
+         * Listeners are called in the EDT thread. You should not do blocking or long-running tasks in this method.
          * @param e The new added layer event
          */
         void layerAdded(LayerAddEvent e);
 
         /**
-         * Notifies this listener that a layer is about to be removed.
+         * Notifies this listener that a alayer was just removed.
          * <p>
-         * Listeners are called in the EDT thread and you can manipulate the layer manager in the current thread.
+         * Listeners are called in the EDT thread after the layer was removed.
+         * Use {@link LayerRemoveEvent#scheduleRemoval(Collection)} to remove more layers.
+         * You should not do blocking or long-running tasks in this method.
          * @param e The layer to be removed (as event)
          */
         void layerRemoving(LayerRemoveEvent e);
@@ -50,7 +55,8 @@ public class LayerManager {
         /**
          * Notifies this listener that the order of layers was changed.
          * <p>
-         * Listeners are called in the EDT thread and you can manipulate the layer manager in the current thread.
+         * Listeners are called in the EDT thread.
+         *  You should not do blocking or long-running tasks in this method.
          * @param e The order change event.
          */
         void layerOrderChanged(LayerOrderChangeEvent e);
@@ -164,14 +170,17 @@ public class LayerManager {
     }
 
     /**
-     * This is the list of layers we manage.
+     * This is the list of layers we manage. The list is unmodifyable. That way, read access does not need to be synchronized.
+     *
+     * It is only changed in the EDT.
+     * @see LayerManager#updateLayers(Consumer)
      */
-    private final List<Layer> layers = new ArrayList<>();
+    private volatile List<Layer> layers = Collections.emptyList();
 
     private final List<LayerChangeListener> layerChangeListeners = new CopyOnWriteArrayList<>();
 
     /**
-     * Add a layer. The layer will be added at a given psoition.
+     * Add a layer. The layer will be added at a given position.
      * @param layer The layer to add
      */
     public void addLayer(final Layer layer) {
@@ -222,9 +231,8 @@ public class LayerManager {
     }
 
     protected Collection<Layer> realRemoveSingleLayer(Layer layerToRemove) {
-        Collection<Layer> newToRemove = fireLayerRemoving(layerToRemove);
-        layers.remove(layerToRemove);
-        return newToRemove;
+        updateLayers(mutableLayers -> mutableLayers.remove(layerToRemove));
+        return fireLayerRemoving(layerToRemove);
     }
 
     /**
@@ -243,11 +251,14 @@ public class LayerManager {
         checkContainsLayer(layer);
         checkPosition(position);
 
-        int curLayerPos = layers.indexOf(layer);
+        int curLayerPos = getLayers().indexOf(layer);
         if (position == curLayerPos)
             return; // already in place.
-        layers.remove(curLayerPos);
-        insertLayerAt(layer, position);
+        // update needs to be done in one run
+        updateLayers(mutableLayers -> {
+            mutableLayers.remove(curLayerPos);
+            insertLayerAt(mutableLayers, layer, position);
+        });
         fireLayerOrderChanged();
     }
 
@@ -257,6 +268,10 @@ public class LayerManager {
      * @param position The position on which we should add it.
      */
     private void insertLayerAt(Layer layer, int position) {
+        updateLayers(mutableLayers -> insertLayerAt(mutableLayers, layer, position));
+    }
+
+    private static void insertLayerAt(List<Layer> layers, Layer layer, int position) {
         if (position == layers.size()) {
             layers.add(layer);
         } else {
@@ -270,17 +285,28 @@ public class LayerManager {
      * @throws IndexOutOfBoundsException if it is not.
      */
     private void checkPosition(int position) {
-        if (position < 0 || position > layers.size()) {
+        if (position < 0 || position > getLayers().size()) {
             throw new IndexOutOfBoundsException("Position " + position + " out of range.");
         }
     }
 
     /**
+     * Update the {@link #layers} field. This method should be used instead of a direct field access.
+     * @param mutator A method that gets the writable list of layers and should modify it.
+     */
+    private void updateLayers(Consumer<List<Layer>> mutator) {
+        GuiHelper.assertCallFromEdt();
+        ArrayList<Layer> newLayers = new ArrayList<>(getLayers());
+        mutator.accept(newLayers);
+        layers = Collections.unmodifiableList(newLayers);
+    }
+
+    /**
      * Gets an unmodifiable list of all layers that are currently in this manager. This list won't update once layers are added or removed.
      * @return The list of layers.
      */
     public List<Layer> getLayers() {
-        return Collections.unmodifiableList(new ArrayList<>(layers));
+        return layers;
     }
 
     /**
@@ -304,8 +330,8 @@ public class LayerManager {
      * @param layer the layer
      * @return true if the list of layers managed by this map view contain layer
      */
-    public synchronized boolean containsLayer(Layer layer) {
-        return layers.contains(layer);
+    public boolean containsLayer(Layer layer) {
+        return getLayers().contains(layer);
     }
 
     protected void checkContainsLayer(Layer layer) {
@@ -385,7 +411,7 @@ public class LayerManager {
 
     /**
      * Fire the layer remove event
-     * @param layer The layer to remove
+     * @param layer The layer that was removed
      * @return A list of layers that should be removed afterwards.
      */
     private Collection<Layer> fireLayerRemoving(Layer layer) {
@@ -418,7 +444,13 @@ public class LayerManager {
      * @since 10432
      */
     public void resetState() {
-        // some layer remove listeners remove other layers.
+        // we force this on to the EDT Thread to have a clean synchronization
+        // The synchronization lock needs to be held by the EDT.
+        GuiHelper.runInEDTAndWaitWithException(this::realResetState);
+    }
+
+    protected synchronized void realResetState() {
+        // The listeners trigger the removal of other layers
         while (!getLayers().isEmpty()) {
             removeLayer(getLayers().get(0));
         }
diff --git a/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java b/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java
index 4879f92..d918401 100644
--- a/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java
+++ b/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java
@@ -54,13 +54,16 @@ public interface LayerPositionStrategy {
      */
     static LayerPositionStrategy inFrontOfFirst(final Predicate<Layer> what) {
         return manager -> {
-            List<Layer> layers = manager.getLayers();
-            for (int i = 0; i < layers.size(); i++) {
-                if (what.test(layers.get(i))) {
-                    return i;
+            if (manager != null) {
+                List<Layer> layers = manager.getLayers();
+                for (int i = 0; i < layers.size(); i++) {
+                    if (what.test(layers.get(i))) {
+                        return i;
+                    }
                 }
+                return layers.size();
             }
-            return layers.size();
+            return 0;
         };
     }
 
@@ -71,10 +74,12 @@ public interface LayerPositionStrategy {
      */
     static LayerPositionStrategy afterLast(final Predicate<Layer> what) {
         return manager -> {
-            List<Layer> layers = manager.getLayers();
-            for (int i = layers.size() - 1; i >= 0; i--) {
-                if (what.test(layers.get(i))) {
-                    return i + 1;
+            if (manager != null) {
+                List<Layer> layers = manager.getLayers();
+                for (int i = layers.size() - 1; i >= 0; i--) {
+                    if (what.test(layers.get(i))) {
+                        return i + 1;
+                    }
                 }
             }
             return 0;
diff --git a/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java b/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java
index 34aa471..b34af7b 100644
--- a/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java
+++ b/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java
@@ -153,22 +153,6 @@ public class MainLayerManager extends LayerManager {
      * Adds a active/edit layer change listener
      *
      * @param listener the listener.
-     * @param initialFire use {@link #addAndFireActiveLayerChangeListener(ActiveLayerChangeListener)} instead.
-     * @deprecated Do not use the second parameter. To be removed in a few weeks.
-     */
-    @Deprecated
-    public synchronized void addActiveLayerChangeListener(ActiveLayerChangeListener listener, boolean initialFire) {
-        if (initialFire) {
-            addAndFireActiveLayerChangeListener(listener);
-        } else {
-            addActiveLayerChangeListener(listener);
-        }
-    }
-
-    /**
-     * Adds a active/edit layer change listener
-     *
-     * @param listener the listener.
      */
     public synchronized void addActiveLayerChangeListener(ActiveLayerChangeListener listener) {
         if (activeLayerChangeListeners.contains(listener)) {
@@ -387,9 +371,9 @@ public class MainLayerManager extends LayerManager {
     }
 
     @Override
-    public void resetState() {
+    protected synchronized void realResetState() {
         // active and edit layer are unset automatically
-        super.resetState();
+        super.realResetState();
 
         activeLayerChangeListeners.clear();
         layerAvailabilityListeners.clear();
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 5391731..3b5fb9d 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
@@ -97,6 +98,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.FileChooserManager;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.io.OsmImporter;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageOverlay;
@@ -197,7 +199,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
     }
 
     /** the global counter for created data layers */
-    private static int dataLayerCounter;
+    private static final AtomicInteger dataLayerCounter = new AtomicInteger();
 
     /**
      * Replies a new unique name for a data layer
@@ -205,8 +207,11 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
      * @return a new unique name for a data layer
      */
     public static String createNewName() {
-        dataLayerCounter++;
-        return tr("Data Layer {0}", dataLayerCounter);
+        return createLayerName(dataLayerCounter.incrementAndGet());
+    }
+
+    static String createLayerName(Object arg) {
+        return tr("Data Layer {0}", arg);
     }
 
     public static final class DataCountVisitor extends AbstractVisitor {
@@ -279,18 +284,6 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
      * Removes a layer state change listener
      *
      * @param listener the listener. Ignored if null or already registered.
-     * @since 5519
-     * @deprecated Method name contains a typo, use {@link #removeLayerStateChangeListener(LayerStateChangeListener)}.
-     */
-    @Deprecated
-    public void removeLayerPropertyChangeListener(LayerStateChangeListener listener) {
-        removeLayerStateChangeListener(listener);
-    }
-
-    /**
-     * Removes a layer state change listener
-     *
-     * @param listener the listener. Ignored if null or already registered.
      * @since 10340
      */
     public void removeLayerStateChangeListener(LayerStateChangeListener listener) {
@@ -363,6 +356,11 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
         data.addDataSetListener(new DataSetListenerAdapter(this));
         data.addDataSetListener(MultipolygonCache.getInstance());
         DataSet.addSelectionListener(this);
+        if (name != null && name.startsWith(createLayerName(""))) {
+            while (AlphanumComparator.getInstance().compare(createLayerName(dataLayerCounter), name) < 0) {
+                dataLayerCounter.incrementAndGet();
+            }
+        }
     }
 
     /**
@@ -647,12 +645,11 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
          * Thus, sorting by OsmPrimitive#getUniqueId gives the original order.
          * (Only works if the data layer has not been saved to and been loaded from an osm file before.)
          */
-        final List<Way> sortedWays = new ArrayList<>(ways);
-        sortedWays.sort(new OsmPrimitiveComparator(true, false)); // sort by OsmPrimitive#getUniqueId ascending
-        Collections.reverse(sortedWays); // sort by OsmPrimitive#getUniqueId descending
-        for (Way w : sortedWays) {
+        ways.stream()
+                .sorted(OsmPrimitiveComparator.comparingUniqueId().reversed())
+                .forEachOrdered(w -> {
             if (!w.isUsable()) {
-                continue;
+                return;
             }
             Collection<Collection<WayPoint>> trk = new ArrayList<>();
             Map<String, Object> trkAttr = new HashMap<>();
@@ -678,7 +675,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
             }
 
             gpxData.tracks.add(new ImmutableGpxTrack(trk, trkAttr));
-        }
+        });
     }
 
     private static WayPoint nodeToWayPoint(Node n) {
diff --git a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
index bf833ff..b42c965 100644
--- a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
@@ -59,19 +59,18 @@ public class TMSLayer extends AbstractCachedTileSourceLayer<TMSTileSource> imple
 
     /**
      * Creates and returns a new TileSource instance depending on the {@link ImageryType}
-     * of the passed ImageryInfo object.
+     * of the {@link ImageryInfo} object specified in the constructor.
      *
      * If no appropriate TileSource is found, null is returned.
      * Currently supported ImageryType are {@link ImageryType#TMS},
      * {@link ImageryType#BING}, {@link ImageryType#SCANEX}.
      *
      *
-     * @param info imagery info
      * @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found.
      * @throws IllegalArgumentException if url from imagery info is null or invalid
      */
     @Override
-    protected TMSTileSource getTileSource(ImageryInfo info) {
+    protected TMSTileSource getTileSource() {
         return getTileSourceStatic(info, () -> {
             Main.debug("Attribution loaded, running loadAllErrorTiles");
             this.loadAllErrorTiles(false);
diff --git a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
index acf27c6..d855dcc 100644
--- a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
@@ -7,7 +7,6 @@ import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -19,6 +18,7 @@ import org.apache.commons.jcs.access.CacheAccess;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.data.imagery.AbstractWMSTileSource;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
@@ -29,13 +29,14 @@ import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
  * This is a layer that grabs the current screen from an WMS server. The data
  * fetched this way is tiled and managed to the disc to reduce server load.
  *
  */
-public class WMSLayer extends AbstractCachedTileSourceLayer<TemplatedWMSTileSource> {
+public class WMSLayer extends AbstractCachedTileSourceLayer<AbstractWMSTileSource> {
     private static final String PREFERENCE_PREFIX = "imagery.wms";
     /**
      * Registers all setting properties
@@ -60,6 +61,9 @@ public class WMSLayer extends AbstractCachedTileSourceLayer<TemplatedWMSTileSour
      */
     public WMSLayer(ImageryInfo info) {
         super(info);
+        CheckParameterUtil.ensureThat(info.getImageryType() == ImageryType.WMS, "ImageryType is WMS");
+        CheckParameterUtil.ensureParameterNotNull(info.getUrl(), "info.url");
+        TemplatedWMSTileSource.checkUrl(info.getUrl());
         this.supportedProjections = new TreeSet<>(info.getServerProjections());
     }
 
@@ -76,18 +80,14 @@ public class WMSLayer extends AbstractCachedTileSourceLayer<TemplatedWMSTileSour
         ret.add(new LayerSaveAction(this));
         ret.add(new LayerSaveAsAction(this));
         ret.add(new BookmarkWmsAction());
-        return ret.toArray(new Action[]{});
+        return ret.toArray(new Action[ret.size()]);
     }
 
     @Override
-    protected TemplatedWMSTileSource getTileSource(ImageryInfo info) {
-        if (info.getImageryType() == ImageryType.WMS && info.getUrl() != null) {
-            TemplatedWMSTileSource.checkUrl(info.getUrl());
-            TemplatedWMSTileSource tileSource = new TemplatedWMSTileSource(info);
-            info.setAttribution(tileSource);
-            return tileSource;
-        }
-        return null;
+    protected AbstractWMSTileSource getTileSource() {
+        AbstractWMSTileSource tileSource = new TemplatedWMSTileSource(info);
+        info.setAttribution(tileSource);
+        return tileSource;
     }
 
     /**
@@ -110,11 +110,6 @@ public class WMSLayer extends AbstractCachedTileSourceLayer<TemplatedWMSTileSour
     }
 
     @Override
-    protected Map<String, String> getHeaders(TemplatedWMSTileSource tileSource) {
-        return tileSource.getHeaders();
-    }
-
-    @Override
     public boolean isProjectionSupported(Projection proj) {
         return supportedProjections == null || supportedProjections.isEmpty() || supportedProjections.contains(proj.toCode()) ||
                 (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326")
diff --git a/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java b/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
index f4cb70c..5579eb7 100644
--- a/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
@@ -51,7 +51,7 @@ public class WMTSLayer extends AbstractCachedTileSourceLayer<WMTSTileSource> imp
     }
 
     @Override
-    protected WMTSTileSource getTileSource(ImageryInfo info) {
+    protected WMTSTileSource getTileSource() {
         try {
             if (info.getImageryType() == ImageryType.WMTS && info.getUrl() != null) {
                 WMTSTileSource.checkUrl(info.getUrl());
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
index 1d6770a..76e2405 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
@@ -415,7 +415,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
 
             Collections.sort(vtTimezones);
 
-            JosmComboBox<String> cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[0]));
+            JosmComboBox<String> cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[vtTimezones.size()]));
 
             String tzId = Main.pref.get("geoimage.timezoneid", "");
             TimeZone defaultTz;
@@ -566,7 +566,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
 
         panelCb.add(new JLabel(tr("GPX track: ")));
 
-        cbGpx = new JosmComboBox<>(gpxLst.toArray(new GpxDataWrapper[0]));
+        cbGpx = new JosmComboBox<>(gpxLst.toArray(new GpxDataWrapper[gpxLst.size()]));
         if (defaultItem != null) {
             cbGpx.setSelectedItem(defaultItem);
         }
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
index 1c3a4d3..87be247 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
@@ -4,11 +4,8 @@ package org.openstreetmap.josm.gui.layer.geoimage;
 import java.awt.Image;
 import java.io.File;
 import java.io.IOException;
-import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
@@ -523,39 +520,9 @@ public final class ImageEntry implements Comparable<ImageEntry>, Cloneable {
             Main.debug(ex);
         }
 
-        // Time and date. We can have these cases:
-        // 1) GPS_TIME_STAMP not set -> date/time will be null
-        // 2) GPS_DATE_STAMP not set -> use EXIF date or set to default
-        // 3) GPS_TIME_STAMP and GPS_DATE_STAMP are set
-        int[] timeStampComps = dirGps.getIntArray(GpsDirectory.TAG_TIME_STAMP);
-        if (timeStampComps != null) {
-            int gpsHour = timeStampComps[0];
-            int gpsMin = timeStampComps[1];
-            int gpsSec = timeStampComps[2];
-            Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-
-            // We have the time. Next step is to check if the GPS date stamp is set.
-            // dirGps.getString() always succeeds, but the return value might be null.
-            String dateStampStr = dirGps.getString(GpsDirectory.TAG_DATE_STAMP);
-            if (dateStampStr != null && dateStampStr.matches("^\\d+:\\d+:\\d+$")) {
-                String[] dateStampComps = dateStampStr.split(":");
-                cal.set(Calendar.YEAR, Integer.parseInt(dateStampComps[0]));
-                cal.set(Calendar.MONTH, Integer.parseInt(dateStampComps[1]) - 1);
-                cal.set(Calendar.DAY_OF_MONTH, Integer.parseInt(dateStampComps[2]));
-            } else {
-                // No GPS date stamp in EXIF data. Copy it from EXIF time.
-                // Date is not set if EXIF time is not available.
-                if (hasExifTime()) {
-                    // Time not set yet, so we can copy everything, not just date.
-                    cal.setTime(getExifTime());
-                }
-            }
-
-            cal.set(Calendar.HOUR_OF_DAY, gpsHour);
-            cal.set(Calendar.MINUTE, gpsMin);
-            cal.set(Calendar.SECOND, gpsSec);
-
-            setExifGpsTime(cal.getTime());
+        final Date gpsDate = dirGps.getGpsDate();
+        if (gpsDate != null) {
+            setExifGpsTime(gpsDate);
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
index 0d97078..bf4e07a 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
@@ -8,7 +8,11 @@ import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 
 import javax.swing.AbstractAction;
 import javax.swing.JLabel;
@@ -102,7 +106,20 @@ public abstract class ConvertToDataLayerAction<T extends Layer> extends Abstract
             final DataSet ds = new DataSet();
             for (Marker marker : layer.data) {
                 final Node node = new Node(marker.getCoor());
-                node.put("name", marker.getText());
+                final Collection<String> mapping = Main.pref.getCollection("gpx.to-osm-mapping",
+                        Arrays.asList("name", "name", "desc", "description", "cmt", "note", "sym", "gpxicon"));
+                if (mapping.size() % 2 == 0) {
+                    final Iterator<String> it = mapping.iterator();
+                    while (it.hasNext()) {
+                        final String gpxKey = it.next();
+                        final String osmKey = it.next();
+                        Optional.ofNullable(marker.getTemplateValue(gpxKey, false))
+                                .map(String::valueOf)
+                                .ifPresent(s -> node.put(osmKey, s));
+                    }
+                } else {
+                    Main.warn("Invalid gpx.to-osm-mapping Einstein setting: expecting even number of entries");
+                }
                 ds.addPrimitive(node);
             }
             return ds;
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java b/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
index c80d8c1..57c1d27 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
@@ -6,8 +6,9 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.Component;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionListener;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
@@ -48,7 +49,7 @@ public class DateFilterPanel extends JPanel {
 
         final Date startTime, endTime;
         Date[] bounds = layer.data.getMinMaxTimeForAllTracks();
-        startTime = (bounds.length == 0) ? new GregorianCalendar(2000, 1, 1).getTime() : bounds[0];
+        startTime = (bounds.length == 0) ? Date.from(ZonedDateTime.of(2000, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()).toInstant()) : bounds[0];
         endTime = (bounds.length == 0) ? new Date() : bounds[1];
 
         dateFrom.setDate(startTime);
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
index 553ab70..32c1fd5 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
@@ -122,7 +122,7 @@ public class DownloadWmsAlongTrackAction extends AbstractAction {
             }
             return null;
         }
-        return AbstractMergeAction.askTargetLayer(targetLayers.toArray(new AbstractTileSourceLayer[0]),
+        return AbstractMergeAction.askTargetLayer(targetLayers.toArray(new AbstractTileSourceLayer[targetLayers.size()]),
                 tr("Please select the imagery layer."),
                 tr("Select imagery layer"),
                 tr("Download"), "dialogs/down");
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java b/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
index 0afbe0f..168a45c 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
@@ -61,7 +61,8 @@ public class GpxDrawHelper implements SoMChangeListener {
     private int delta;
     private double minTrackDurationForTimeColoring;
 
-    private int hdopfactor;
+    /** maximum value of displayed HDOP, minimum is 0 */
+    private int hdoprange;
 
     private static final double PHI = Math.toRadians(15);
 
@@ -213,7 +214,8 @@ public class GpxDrawHelper implements SoMChangeListener {
         delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", spec, 40);
         colorTracksTune = Main.pref.getInteger("draw.rawgps.colorTracksTune", spec, 45);
         colorModeDynamic = Main.pref.getBoolean("draw.rawgps.colors.dynamic", spec, false);
-        hdopfactor = Main.pref.getInteger("hdop.factor", 25);
+        /* good HDOP's are between 1 and 3, very bad HDOP's go into 3 digit values */
+        hdoprange = Main.pref.getInteger("hdop.range", 7);
         minTrackDurationForTimeColoring = Main.pref.getInteger("draw.rawgps.date-coloring-min-dt", 60);
         largePointAlpha = Main.pref.getInteger("draw.rawgps.large.alpha", -1) & 0xFF;
 
@@ -310,7 +312,7 @@ public class GpxDrawHelper implements SoMChangeListener {
             oldWp = null;
         } else { // color mode not dynamic
             velocityScale.setRange(0, colorTracksTune);
-            hdopScale.setRange(0, 1.0/hdopfactor);
+            hdopScale.setRange(0, hdoprange);
         }
         double now = System.currentTimeMillis()/1000.0;
         if (colored == ColorMode.TIME) {
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java b/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
index 3103299..8a0b92e 100644
--- a/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
@@ -20,8 +20,8 @@ import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
  * @since 10651
  */
 public class TileCoordinateConverter {
-    private MapView mapView;
-    private TileSourceDisplaySettings settings;
+    private final MapView mapView;
+    private final TileSourceDisplaySettings settings;
     private final TileSource tileSource;
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TilePosition.java b/src/org/openstreetmap/josm/gui/layer/imagery/TilePosition.java
new file mode 100644
index 0000000..23478e7
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/TilePosition.java
@@ -0,0 +1,53 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import org.openstreetmap.gui.jmapviewer.Tile;
+
+/**
+ * The position of a single tile.
+ * @author Michael Zangl
+ */
+public class TilePosition {
+    private final int x;
+    private final int y;
+    private final int zoom;
+    TilePosition(int x, int y, int zoom) {
+        this.x = x;
+        this.y = y;
+        this.zoom = zoom;
+    }
+
+    /**
+     * Constructs a new {@code TilePosition}.
+     * @param tile tile
+     */
+    public TilePosition(Tile tile) {
+        this(tile.getXtile(), tile.getYtile(), tile.getZoom());
+    }
+
+    /**
+     * @return the x position
+     */
+    public int getX() {
+        return x;
+    }
+
+    /**
+     * @return the y position
+     */
+    public int getY() {
+        return y;
+    }
+
+    /**
+     * @return the zoom
+     */
+    public int getZoom() {
+        return zoom;
+    }
+
+    @Override
+    public String toString() {
+        return "TilePosition [x=" + x + ", y=" + y + ", zoom=" + zoom + ']';
+    }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TileRange.java b/src/org/openstreetmap/josm/gui/layer/imagery/TileRange.java
new file mode 100644
index 0000000..6fbe067
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/TileRange.java
@@ -0,0 +1,58 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import java.util.function.Function;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.openstreetmap.gui.jmapviewer.TileXY;
+
+/**
+ * This is a rectangular range of tiles.
+ */
+public class TileRange {
+    protected int minX;
+    protected int maxX;
+    protected int minY;
+    protected int maxY;
+    protected int zoom;
+
+    protected TileRange() {
+    }
+
+    protected TileRange(TileXY t1, TileXY t2, int zoom) {
+        minX = (int) Math.floor(Math.min(t1.getX(), t2.getX()));
+        minY = (int) Math.floor(Math.min(t1.getY(), t2.getY()));
+        maxX = (int) Math.ceil(Math.max(t1.getX(), t2.getX()));
+        maxY = (int) Math.ceil(Math.max(t1.getY(), t2.getY()));
+        this.zoom = zoom;
+    }
+
+    protected double tilesSpanned() {
+        return Math.sqrt(1.0 * this.size());
+    }
+
+    /**
+     * Returns size
+     * @return size
+     */
+    public int size() {
+        int xSpan = maxX - minX + 1;
+        int ySpan = maxY - minY + 1;
+        return xSpan * ySpan;
+    }
+
+    /**
+     * Gets a stream of all tile positions in this set
+     * @return A stream of all positions
+     */
+    public Stream<TilePosition> tilePositions() {
+        if (zoom == 0) {
+            return Stream.empty();
+        } else {
+            return IntStream.rangeClosed(minX, maxX).mapToObj(
+                    x -> IntStream.rangeClosed(minY, maxY).mapToObj(y -> new TilePosition(x, y, zoom))
+                    ).flatMap(Function.identity());
+        }
+    }
+}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
index 11cdd2c..d98dd11 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
@@ -34,6 +34,26 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
 
+/**
+ * Generates a list of {@link StyleElement}s for a primitive, to
+ * be drawn on the map.
+ * There are several steps to derive the list of elements for display:
+ * <ol>
+ * <li>{@link #generateStyles(OsmPrimitive, double, boolean)} applies the
+ * {@link StyleSource}s one after another to get a key-value map of MapCSS
+ * properties. Then a preliminary set of StyleElements is derived from the
+ * properties map.</li>
+ * <li>{@link #getImpl(OsmPrimitive, double, NavigatableComponent)} handles the
+ * different forms of multipolygon tagging.</li>
+ * <li>{@link #getStyleCacheWithRange(OsmPrimitive, double, NavigatableComponent)}
+ * adds a default StyleElement for primitives that would be invisible otherwise.
+ * (For example untagged nodes and ways.)</li>
+ * </ol>
+ * The results are cached with respect to the current scale.
+ *
+ * Use {@link #setStyleSources(Collection)} to select the StyleSources that are
+ * applied.
+ */
 public class ElemStyles implements PreferenceChangedListener {
     private final List<StyleSource> styleSources;
     private boolean drawMultipolygon;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/Keyword.java b/src/org/openstreetmap/josm/gui/mappaint/Keyword.java
index ca9604b..3a77933 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/Keyword.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/Keyword.java
@@ -4,6 +4,14 @@ package org.openstreetmap.josm.gui.mappaint;
 import java.util.Locale;
 import java.util.Objects;
 
+/**
+ * A MapCSS keyword.
+ *
+ * For example "<code>round</code>" is a keyword in
+ * <pre>linecap: round;</pre>
+ * Keywords are similar to a Java enum value. In accordance with the CSS
+ * specification, they are parsed case insensitive.
+ */
 public class Keyword {
     public final String val;
 
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
index f902fd3..67eed00 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
@@ -5,8 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -41,11 +40,11 @@ import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
 
 /**
- * This class manages the ElemStyles instance. The object you get with
- * getStyles() is read only, any manipulation happens via one of
- * the wrapper methods here. (readFromPreferences, moveStyles, ...)
+ * This class manages the list of available map paint styles and gives access to
+ * the ElemStyles singleton.
  *
- * On change, mapPaintSylesUpdated() is fired for all listeners.
+ * On change, {@link MapPaintSylesUpdateListener#mapPaintStylesUpdated()} is fired
+ * for all listeners.
  */
 public final class MapPaintStyles {
 
@@ -60,8 +59,12 @@ public final class MapPaintStyles {
     private static ElemStyles styles = new ElemStyles();
 
     /**
-     * Returns the {@link ElemStyles} instance.
-     * @return the {@code ElemStyles} instance
+     * Returns the {@link ElemStyles} singleton instance.
+     *
+     * The returned object is read only, any manipulation happens via one of
+     * the other wrapper methods in this class. ({@link #readFromPreferences},
+     * {@link #moveStyles}, ...)
+     * @return the {@code ElemStyles} singleton instance
      */
     public static ElemStyles getStyles() {
         return styles;
@@ -313,7 +316,7 @@ public final class MapPaintStyles {
                 throw new IllegalDataException("XML style");
             if (Utils.hasExtension(entry.url, "mapcss"))
                 return new MapCSSStyleSource(entry);
-            try (InputStreamReader reader = new InputStreamReader(cf.getInputStream(), StandardCharsets.UTF_8)) {
+            try (Reader reader = cf.getContentReader()) {
                 WHILE: while (true) {
                     int c = reader.read();
                     switch (c) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
index 3c640ec..919d778 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
@@ -48,8 +48,7 @@ public final class StyleCache {
             ds = new DividedScale<>();
         }
         s.states[idx] = ds.put(o, r);
-        s.intern();
-        return s;
+        return s.intern();
     }
 
     public Pair<StyleElementList, Range> getWithRange(double scale, boolean selected) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
index b4b5a30..f7481a3 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.function.IntFunction;
 import java.util.function.IntSupplier;
+import java.util.Set;
 import java.util.regex.PatternSyntaxException;
 
 import org.openstreetmap.josm.Main;
@@ -314,10 +315,11 @@ public interface Selector {
                             e.osm.getReferrers(), p -> p.hasTag("type", "multipolygon")), Relation.class);
                     final Relation multipolygon = multipolygons.iterator().next();
                     if (multipolygon == null) throw new NoSuchElementException();
+                    final Set<OsmPrimitive> members = multipolygon.getMemberPrimitives();
                     containsFinder = new ContainsFinder(new Environment(multipolygon)) {
                         @Override
                         public boolean isPrimitiveUsable(OsmPrimitive p) {
-                            return super.isPrimitiveUsable(p) && !multipolygon.getMemberPrimitives().contains(p);
+                            return super.isPrimitiveUsable(p) && !members.contains(p);
                         }
                     };
                 } catch (NoSuchElementException ignore) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
index f66d4e2..4b024bc 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
@@ -115,7 +115,8 @@ public class LineElement extends StyleElement {
         painter.drawWay(w, myColor, myLine, myDashLine, myDashedColor, offset, showOrientation,
                 showOnlyHeadArrowOnly, showOneway, onewayReversed);
 
-        if (paintSettings.isShowOrderNumber() && !painter.isInactiveMode()) {
+        if ((paintSettings.isShowOrderNumber() || (paintSettings.isShowOrderNumberOnSelectedWay() && selected))
+                && !painter.isInactiveMode()) {
             int orderNumber = 0;
             lastN = null;
             for (Node n : w.getNodes()) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java
index 511f641..f8bc114 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java
@@ -14,7 +14,28 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 public class RepeatImageElement extends StyleElement {
 
-    public enum LineImageAlignment { TOP, CENTER, BOTTOM }
+    /**
+     * The side on which the image should be aligned to the line.
+     */
+    public enum LineImageAlignment {
+        TOP(.5),
+        CENTER(0),
+        BOTTOM(-.5);
+
+        private final double alignmentOffset;
+
+        LineImageAlignment(double alignmentOffset) {
+            this.alignmentOffset = alignmentOffset;
+        }
+
+        /**
+         * Gets the alignment offset.
+         * @return The offset relative to the image height compared to placing the image in the middle of the line.
+         */
+        public double getAlignmentOffset() {
+            return alignmentOffset;
+        }
+    }
 
     public MapImage pattern;
     public float offset;
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
index 22997a0..773a669 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
@@ -60,7 +60,6 @@ import org.openstreetmap.josm.gui.preferences.validator.ValidatorTestsPreference
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.PluginProxy;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -154,9 +153,7 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
                 }
                 // check if plugin dependences can also be loaded
                 Collection<PluginInformation> allPlugins = new HashSet<>(toLoad);
-                for (PluginProxy proxy : PluginHandler.pluginList) {
-                    allPlugins.add(proxy.getPluginInformation());
-                }
+                allPlugins.addAll(PluginHandler.getPlugins());
                 boolean removed;
                 do {
                     removed = false;
@@ -590,18 +587,7 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
                     // Add GUI for sub preferences
                     for (PreferenceSetting setting : settings) {
                         if (setting instanceof SubPreferenceSetting) {
-                            SubPreferenceSetting sps = (SubPreferenceSetting) setting;
-                            if (sps.getTabPreferenceSetting(this) == preferenceSettings) {
-                                try {
-                                    sps.addGui(this);
-                                } catch (SecurityException ex) {
-                                    Main.error(ex);
-                                } catch (RuntimeException ex) {
-                                    BugReportExceptionHandler.handleException(ex);
-                                } finally {
-                                    settingsInitialized.add(sps);
-                                }
-                            }
+                            addSubPreferenceSetting(preferenceSettings, (SubPreferenceSetting) setting);
                         }
                     }
                     Icon icon = getIconAt(index);
@@ -620,4 +606,18 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
             }
         }
     }
+
+    private void addSubPreferenceSetting(TabPreferenceSetting preferenceSettings, SubPreferenceSetting sps) {
+        if (sps.getTabPreferenceSetting(this) == preferenceSettings) {
+            try {
+                sps.addGui(this);
+            } catch (SecurityException ex) {
+                Main.error(ex);
+            } catch (RuntimeException ex) {
+                BugReportExceptionHandler.handleException(ex);
+            } finally {
+                settingsInitialized.add(sps);
+            }
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java b/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java
index 38055c5..a1c8dc9 100644
--- a/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java
+++ b/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java
@@ -14,5 +14,5 @@ public interface SubPreferenceSetting extends PreferenceSetting {
      * @param gui preferences tabbed pane
      * @return parent preference setting
      */
-    TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui);
+    TabPreferenceSetting getTabPreferenceSetting(PreferenceTabbedPane gui);
 }
diff --git a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
index eaaf443..7571e04 100644
--- a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
+++ b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
@@ -1038,7 +1038,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
     public void refreshToolbarControl() {
         control.removeAll();
         buttonActions.clear();
-        boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0) != null;
+        boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0).isPresent();
 
         for (ActionDefinition action : getDefinedActions()) {
             if (action.isSeparator()) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
index 6e72b6c..fb388bf 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
@@ -42,6 +42,7 @@ public class DrawingPreference implements SubPreferenceSetting {
     private final JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way."));
     private final JCheckBox onewayArrow = new JCheckBox(tr("Draw oneway arrows."));
     private final JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers"));
+    private final JCheckBox segmentOrderNumberOnSelectedWay = new JCheckBox(tr("Draw segment order numbers on selected way"));
     private final JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data"));
     private final JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode"));
     private final JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
@@ -91,6 +92,8 @@ public class DrawingPreference implements SubPreferenceSetting {
         // segment order number
         segmentOrderNumber.setToolTipText(tr("Draw the order numbers of all segments within their way."));
         segmentOrderNumber.setSelected(Main.pref.getBoolean("draw.segment.order_number", false));
+        segmentOrderNumberOnSelectedWay.setToolTipText(tr("Draw the order numbers of all segments within their way."));
+        segmentOrderNumberOnSelectedWay.setSelected(Main.pref.getBoolean("draw.segment.order_number.on_selected", false));
 
         // downloaded area
         sourceBounds.setToolTipText(tr("Draw the boundaries of data loaded from the server."));
@@ -135,6 +138,7 @@ public class DrawingPreference implements SubPreferenceSetting {
         panel.add(headArrow, GBC.eop().insets(40, 0, 0, 0));
         panel.add(onewayArrow, GBC.eop().insets(20, 0, 0, 0));
         panel.add(segmentOrderNumber, GBC.eop().insets(20, 0, 0, 0));
+        panel.add(segmentOrderNumberOnSelectedWay, GBC.eop().insets(20, 0, 0, 0));
 
         panel.add(new JLabel(tr("Select and draw mode options")),
                 GBC.eop().insets(5, 10, 0, 0));
@@ -175,6 +179,7 @@ public class DrawingPreference implements SubPreferenceSetting {
         Main.pref.put("draw.segment.head_only", headArrow.isSelected());
         Main.pref.put("draw.oneway", onewayArrow.isSelected());
         Main.pref.put("draw.segment.order_number", segmentOrderNumber.isSelected());
+        Main.pref.put("draw.segment.order_number.on_selected", segmentOrderNumberOnSelectedWay.isSelected());
         Main.pref.put("draw.data.downloaded_area", sourceBounds.isSelected());
         Main.pref.put("draw.data.inactive_color", inactive.isSelected());
         Main.pref.put("mappaint.use-antialiasing", useAntialiasing.isSelected());
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
index 07481fe..7589941 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
@@ -35,7 +35,7 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
 
     private static final int WAYPOINT_LABEL_CUSTOM = 6;
     private static final String[] LABEL_PATTERN_TEMPLATE = new String[] {Marker.LABEL_PATTERN_AUTO, Marker.LABEL_PATTERN_NAME,
-        Marker.LABEL_PATTERN_DESC, "{special:everything}", "?{ '{name}' | '{desc}' | '{formattedWaypointOffset}' }", ""};
+        Marker.LABEL_PATTERN_DESC, "{special:everything}", "?{ '{name}' | '{desc}' | '{formattedWaypointOffset}' }", " "};
     private static final String[] LABEL_PATTERN_DESC = new String[] {tr("Auto"), /* gpx data field name */ trc("gpx_field", "Name"),
         /* gpx data field name */ trc("gpx_field", "Desc(ription)"), tr("Everything"), tr("Name or offset"), tr("None"), tr("Custom")};
 
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
index 8aff548..049b36e 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
@@ -72,7 +73,8 @@ public class AddWMSLayerPanel extends AddImageryPanel {
             try {
                 wms.attemptGetCapabilities(rawUrl.getText());
                 tree.updateTree(wms);
-                formats.setModel(new DefaultComboBoxModel<>(wms.getFormats().toArray(new String[0])));
+                List<String> wmsFormats = wms.getFormats();
+                formats.setModel(new DefaultComboBoxModel<>(wmsFormats.toArray(new String[wmsFormats.size()])));
                 formats.setSelectedItem(wms.getPreferredFormats());
             } catch (MalformedURLException ex1) {
                 Main.error(ex1, false);
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
index f9724c4..1e2c11e 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
@@ -13,6 +13,7 @@ import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -49,6 +50,7 @@ import org.openstreetmap.gui.jmapviewer.MapPolygonImpl;
 import org.openstreetmap.gui.jmapviewer.MapRectangleImpl;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapPolygon;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapRectangle;
+import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
@@ -337,6 +339,15 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
 
             // Add default item map
             defaultMap = new JMapViewer();
+            defaultMap.setTileSource(new OsmTileSource.Mapnik()); // for attribution
+            defaultMap.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseClicked(MouseEvent e) {
+                    if (e.getButton() == MouseEvent.BUTTON1) {
+                        defaultMap.getAttribution().handleAttribution(e.getPoint(), true);
+                    }
+                }
+            });
             defaultMap.setZoomContolsVisible(false);
             defaultMap.setMinimumSize(new Dimension(100, 200));
             add(defaultMap, GBC.std().insets(5, 5, 0, 0).fill(GridBagConstraints.BOTH).weight(0.33, 0.6).insets(5, 0, 0, 0));
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
index 722298b..0a4ba48 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
@@ -590,7 +590,7 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
                             tr("Enter URL"),
                             JOptionPane.QUESTION_MESSAGE
                             );
-                    if (s != null) {
+                    if (s != null && !s.isEmpty()) {
                         model.addElement(s);
                     }
                 }
@@ -616,7 +616,7 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
                             null,
                             list.getSelectedValue()
                             );
-                    if (s != null) {
+                    if (s != null && !s.isEmpty()) {
                         model.setElementAt(s, list.getSelectedIndex());
                     }
                 }
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
index 02d5423..80f1769 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
@@ -91,7 +91,7 @@ public class CodeProjectionChoice extends AbstractProjectionChoice implements Su
             filter.setColumns(10);
             filter.getDocument().addDocumentListener(this);
 
-            selectionList = new JList<>(data.toArray(new String[0]));
+            selectionList = new JList<>(data.toArray(new String[data.size()]));
             selectionList.setModel(model);
             JScrollPane scroll = new JScrollPane(selectionList);
             scroll.setPreferredSize(new Dimension(200, 214));
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
index fa1050e..487da11 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.preferences.projection;
 
+import static org.openstreetmap.josm.data.SystemOfMeasurement.ALL_SYSTEMS;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
@@ -270,7 +271,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
     private static final StringProperty PROP_COORDINATES = new StringProperty("coordinates", null);
     private static final CollectionProperty PROP_SUB_PROJECTION = new CollectionProperty("projection.sub", null);
     public static final StringProperty PROP_SYSTEM_OF_MEASUREMENT = new StringProperty("system_of_measurement", "Metric");
-    private static final String[] unitsValues = (new ArrayList<>(SystemOfMeasurement.ALL_SYSTEMS.keySet())).toArray(new String[0]);
+    private static final String[] unitsValues = ALL_SYSTEMS.keySet().toArray(new String[ALL_SYSTEMS.size()]);
     private static final String[] unitsValuesTr = new String[unitsValues.length];
     static {
         for (int i = 0; i < unitsValues.length; ++i) {
@@ -281,7 +282,8 @@ public class ProjectionPreference implements SubPreferenceSetting {
     /**
      * Combobox with all projections available
      */
-    private final JosmComboBox<ProjectionChoice> projectionCombo = new JosmComboBox<>(projectionChoices.toArray(new ProjectionChoice[0]));
+    private final JosmComboBox<ProjectionChoice> projectionCombo = new JosmComboBox<>(
+            projectionChoices.toArray(new ProjectionChoice[projectionChoices.size()]));
 
     /**
      * Combobox with all coordinate display possibilities
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
index 99cf7fc..21ea8cf 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
@@ -43,7 +43,7 @@ public class UTMProjectionChoice extends ListProjectionChoice {
      * Constructs a new {@code UTMProjectionChoice}.
      */
     public UTMProjectionChoice() {
-        super(tr("UTM"), /* NO-ICON */ "core:utm", cbEntries.toArray(new String[0]), tr("UTM Zone"));
+        super(tr("UTM"), /* NO-ICON */ "core:utm", cbEntries.toArray(new String[cbEntries.size()]), tr("UTM Zone"));
     }
 
     private class UTMPanel extends CBPanel {
diff --git a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
index de36908..33e4155 100644
--- a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
@@ -224,7 +224,7 @@ public class PrefJPanel extends JPanel {
         cbAlt.setAction(action);
         cbAlt.setText(ALT); // see above for why no tr()
         tfKey.setAction(action);
-        tfKey.setModel(new DefaultComboBoxModel<>(keyList.values().toArray(new String[0])));
+        tfKey.setModel(new DefaultComboBoxModel<>(keyList.values().toArray(new String[keyList.size()])));
         cbMeta.setAction(action);
         cbMeta.setText(META); // see above for why no tr()
 
diff --git a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
index be119b0..dfeb164 100644
--- a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
@@ -36,7 +36,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
         void appendLogMessage(String message);
     }
 
-    public static final int PROGRESS_BAR_MAX = 10000;
+    public static final int PROGRESS_BAR_MAX = 10_000;
     private final Component dialogParent;
 
     private int currentProgressValue;
diff --git a/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
index c500a2f..64c9a58 100644
--- a/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
@@ -37,7 +37,7 @@ public interface ProgressMonitor {
     }
 
     /** Ticks count used, when no other value is supplied */
-    int DEFAULT_TICKS = 10000;
+    int DEFAULT_TICKS = 10_000;
 
     /**
      * Can be used with {@link #worked(int)} and {@link #createSubTaskMonitor(int, boolean)} to
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
index 56c3ed6..3108e4a 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
@@ -48,7 +48,7 @@ public class Combo extends ComboMultiSelect {
             lhm.put("", new PresetListEntry(""));
         }
 
-        combobox = new JosmComboBox<>(lhm.values().toArray(new PresetListEntry[0]));
+        combobox = new JosmComboBox<>(lhm.values().toArray(new PresetListEntry[lhm.size()]));
         component = combobox;
         combobox.setRenderer(getListCellRenderer());
         combobox.setEditable(editable);
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java
index c5d0d42..7188047 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java
@@ -25,7 +25,7 @@ public class MultiSelect extends ComboMultiSelect {
 
     @Override
     protected void addToPanelAnchor(JPanel p, String def, boolean presetInitiallyMatches) {
-        list = new ConcatenatingJList(delimiter, lhm.values().toArray(new PresetListEntry[0]));
+        list = new ConcatenatingJList(delimiter, lhm.values().toArray(new PresetListEntry[lhm.size()]));
         component = list;
         ListCellRenderer<PresetListEntry> renderer = getListCellRenderer();
         list.setCellRenderer(renderer);
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
index 7a7a79b..b7a12d2 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
@@ -105,7 +105,7 @@ public class Text extends KeyedItem {
             originalValue = usage.getFirst();
         } else {
             // the objects have different values
-            JosmComboBox<String> comboBox = new JosmComboBox<>(usage.values.toArray(new String[0]));
+            JosmComboBox<String> comboBox = new JosmComboBox<>(usage.values.toArray(new String[usage.values.size()]));
             comboBox.setEditable(true);
             comboBox.setEditor(textField);
             comboBox.getEditor().setItem(DIFFERENT);
diff --git a/src/org/openstreetmap/josm/gui/util/GuiHelper.java b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
index 9f59dc3..f16ab7e 100644
--- a/src/org/openstreetmap/josm/gui/util/GuiHelper.java
+++ b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
@@ -481,7 +481,7 @@ public final class GuiHelper {
      * @since 10024
      */
     public static void extendTooltipDelay(Component c) {
-        extendTooltipDelay(c, 60000);
+        extendTooltipDelay(c, 60_000);
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/util/HighlightHelper.java b/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
index a6d0337..494e460 100644
--- a/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
+++ b/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
@@ -87,7 +87,7 @@ public class HighlightHelper {
             Relation r = (Relation) p;
             seenRelations.add(r);
             boolean needRepaint = false;
-            for (OsmPrimitive m : r.getMemberPrimitives()) {
+            for (OsmPrimitive m : r.getMemberPrimitivesList()) {
                 if (!(m instanceof Relation) || !seenRelations.contains(m)) {
                     needRepaint |= setHighlight(m, flag, seenRelations);
                 }
diff --git a/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java b/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java
index 4e3542b..815c339 100644
--- a/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java
+++ b/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java
@@ -138,7 +138,7 @@ public abstract class AbstractFileChooser {
      * @param filter the new current file filter to use
      * @see #getFileFilter
      */
-    public abstract void setFileFilter(final FileFilter filter);
+    public abstract void setFileFilter(FileFilter filter);
 
     /**
      * Sets the <code>JFileChooser</code> to allow the user to just
diff --git a/src/org/openstreetmap/josm/gui/widgets/EditableList.java b/src/org/openstreetmap/josm/gui/widgets/EditableList.java
index bfb2c38..606465a 100644
--- a/src/org/openstreetmap/josm/gui/widgets/EditableList.java
+++ b/src/org/openstreetmap/josm/gui/widgets/EditableList.java
@@ -49,7 +49,7 @@ public class EditableList extends JPanel {
                     title,
                     title,
                     JOptionPane.QUESTION_MESSAGE);
-            if (source != null) {
+            if (source != null && !source.isEmpty()) {
                 ((DefaultListModel<String>) sourcesList.getModel()).addElement(source);
             }
             sourcesList.clearSelection();
@@ -64,7 +64,7 @@ public class EditableList extends JPanel {
             if (row == -1) {
                 if (sourcesList.getModel().getSize() == 0) {
                     String source1 = JOptionPane.showInputDialog(Main.parent, title, title, JOptionPane.QUESTION_MESSAGE);
-                    if (source1 != null) {
+                    if (source1 != null && !source1.isEmpty()) {
                         ((DefaultListModel<String>) sourcesList.getModel()).addElement(source1);
                     }
                 } else {
@@ -81,7 +81,7 @@ public class EditableList extends JPanel {
                         title,
                         JOptionPane.QUESTION_MESSAGE, null, null,
                         sourcesList.getSelectedValue());
-                if (source2 != null) {
+                if (source2 != null && !source2.isEmpty()) {
                     ((DefaultListModel<String>) sourcesList.getModel()).setElementAt(source2, row);
                 }
             }
diff --git a/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java b/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java
index 9b32766..e483a86 100644
--- a/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java
+++ b/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java
@@ -6,6 +6,8 @@ import java.awt.FileDialog;
 import java.awt.Frame;
 import java.io.File;
 import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
@@ -23,6 +25,7 @@ public class NativeFileChooser extends AbstractFileChooser {
     /** The instance of the fileDialog */
     private final FileDialog fileDialog;
     private FileFilter fileFilter;
+    private final List<FileFilter> fileFilters = new ArrayList<>();
     private int selectionMode;
 
     /**
@@ -44,6 +47,7 @@ public class NativeFileChooser extends AbstractFileChooser {
         // TODO implement this after Oracle fixes JDK-4811090 / JDK-6192906
         // https://bugs.openjdk.java.net/browse/JDK-4811090 : Extend awt filedialog
         // https://bugs.openjdk.java.net/browse/JDK-6192906 : Add more features to java.awt.FileDialog
+        fileFilters.add(filter);
     }
 
     @Override
@@ -51,7 +55,7 @@ public class NativeFileChooser extends AbstractFileChooser {
         // TODO implement this after Oracle fixes JDK-4811090 / JDK-6192906
         // https://bugs.openjdk.java.net/browse/JDK-4811090 : Extend awt filedialog
         // https://bugs.openjdk.java.net/browse/JDK-6192906 : Add more features to java.awt.FileDialog
-        return new FileFilter[]{};
+        return fileFilters.toArray(new FileFilter[fileFilters.size()]);
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
index d552e9d..6c7ee62 100644
--- a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
+++ b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
@@ -206,7 +206,7 @@ public class BoundingBoxDownloader extends OsmServerReader {
         progressMonitor.beginTask(tr("Downloading notes"));
         CheckParameterUtil.ensureThat(noteLimit > 0, "Requested note limit is less than 1.");
         // see result_limit in https://github.com/openstreetmap/openstreetmap-website/blob/master/app/controllers/notes_controller.rb
-        CheckParameterUtil.ensureThat(noteLimit <= 10000, "Requested note limit is over API hard limit of 10000.");
+        CheckParameterUtil.ensureThat(noteLimit <= 10_000, "Requested note limit is over API hard limit of 10000.");
         CheckParameterUtil.ensureThat(daysClosed >= -1, "Requested note limit is less than -1.");
         String url = "notes?limit=" + noteLimit + "&closed=" + daysClosed + "&bbox=" + lon1 + ',' + lat1 + ',' + lon2 + ',' + lat2;
         try {
diff --git a/src/org/openstreetmap/josm/io/CachedFile.java b/src/org/openstreetmap/josm/io/CachedFile.java
index 652a260..113ce1e 100644
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
@@ -524,4 +524,25 @@ public class CachedFile implements Closeable {
             activeConnection.disconnect();
         }
     }
+
+    /**
+     * Clears the cached file
+     * @throws IOException if any I/O error occurs
+     * @since 10993
+     */
+    public void clear() throws IOException {
+        URL url;
+        try {
+            url = new URL(name);
+            if ("file".equals(url.getProtocol())) {
+                return; // this is local file - do not delete it
+            }
+        } catch (MalformedURLException e) {
+            return; // if it's not a URL, then it still might be a local file - better not to delete
+        }
+        File f = getFile();
+        if (f != null && f.exists()) {
+            Utils.deleteFile(f);
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/io/DefaultProxySelector.java b/src/org/openstreetmap/josm/io/DefaultProxySelector.java
index a608d07..9555d9c 100644
--- a/src/org/openstreetmap/josm/io/DefaultProxySelector.java
+++ b/src/org/openstreetmap/josm/io/DefaultProxySelector.java
@@ -96,7 +96,7 @@ public class DefaultProxySelector extends ProxySelector {
             Main.error(tr("The proxy will not be used."));
             return 0;
         }
-        if (port <= 0 || port > 65535) {
+        if (port <= 0 || port > 65_535) {
             Main.error(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port));
             Main.error(tr("The proxy will not be used."));
             return 0;
diff --git a/src/org/openstreetmap/josm/io/GeoJSONWriter.java b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
index f3a6704..a5b6b6b 100644
--- a/src/org/openstreetmap/josm/io/GeoJSONWriter.java
+++ b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
@@ -17,6 +17,7 @@ import javax.json.JsonObjectBuilder;
 import javax.json.JsonWriter;
 import javax.json.stream.JsonGenerator;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -118,7 +119,10 @@ public class GeoJSONWriter {
 
         @Override
         public void visit(Relation r) {
-            if (r != null && r.isMultipolygon() && !r.hasIncompleteMembers()) {
+            if (r == null || !r.isMultipolygon() || r.hasIncompleteMembers()) {
+                return;
+            }
+            try {
                 final Pair<List<JoinedPolygon>, List<JoinedPolygon>> mp = MultipolygonBuilder.joinWays(r);
                 final JsonArrayBuilder polygon = Json.createArrayBuilder();
                 Stream.concat(mp.a.stream(), mp.b.stream())
@@ -129,6 +133,9 @@ public class GeoJSONWriter {
                 geomObj.add("type", "MultiPolygon");
                 final JsonArrayBuilder multiPolygon = Json.createArrayBuilder().add(polygon);
                 geomObj.add("coordinates", multiPolygon);
+            } catch (MultipolygonBuilder.JoinedPolygonCreationException ex) {
+                Main.warn("GeoJSON: Failed to export multipolygon {0}", r.getUniqueId());
+                Main.warn(ex);
             }
         }
     }
diff --git a/src/org/openstreetmap/josm/io/GpxExporter.java b/src/org/openstreetmap/josm/io/GpxExporter.java
index 673f3c0..96fe5aa 100644
--- a/src/org/openstreetmap/josm/io/GpxExporter.java
+++ b/src/org/openstreetmap/josm/io/GpxExporter.java
@@ -11,7 +11,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.MessageFormat;
-import java.util.Calendar;
+import java.time.Year;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -224,7 +224,7 @@ public class GpxExporter extends FileExporter implements GpxConstants {
             if (copyrightYear.getText().isEmpty()) {
                 String sCopyrightYear = data.getString(META_COPYRIGHT_YEAR);
                 if (sCopyrightYear == null) {
-                    sCopyrightYear = Integer.toString(Calendar.getInstance().get(Calendar.YEAR));
+                    sCopyrightYear = Year.now().toString();
                 }
                 copyrightYear.setText(sCopyrightYear);
             }
diff --git a/src/org/openstreetmap/josm/io/NameFinder.java b/src/org/openstreetmap/josm/io/NameFinder.java
new file mode 100644
index 0000000..2b5c51a
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/NameFinder.java
@@ -0,0 +1,275 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.OsmUrlToBounds;
+import org.openstreetmap.josm.tools.UncheckedParseException;
+import org.openstreetmap.josm.tools.Utils;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Search for names and related items.
+ * @since 11002
+ */
+public final class NameFinder {
+
+    /**
+     * Nominatim URL.
+     */
+    public static final String NOMINATIM_URL = "https://nominatim.openstreetmap.org/search?format=xml&q=";
+
+    private NameFinder() {
+    }
+
+    /**
+     * Performs a Nominatim search.
+     * @param searchExpression Nominatim search expression
+     * @return search results
+     * @throws IOException if any IO error occurs.
+     */
+    public static List<SearchResult> queryNominatim(final String searchExpression) throws IOException {
+        return query(new URL(NOMINATIM_URL + Utils.encodeUrl(searchExpression)));
+    }
+
+    /**
+     * Performs a custom search.
+     * @param url search URL to any Nominatim instance
+     * @return search results
+     * @throws IOException if any IO error occurs.
+     */
+    public static List<SearchResult> query(final URL url) throws IOException {
+        final HttpClient connection = HttpClient.create(url);
+        connection.connect();
+        try (Reader reader = connection.getResponse().getContentReader()) {
+            return parseSearchResults(reader);
+        } catch (ParserConfigurationException | SAXException ex) {
+            throw new UncheckedParseException(ex);
+        }
+    }
+
+    /**
+     * Parse search results as returned by Nominatim.
+     * @param reader reader
+     * @return search results
+     * @throws ParserConfigurationException if a parser cannot be created which satisfies the requested configuration.
+     * @throws SAXException for SAX errors.
+     * @throws IOException if any IO error occurs.
+     */
+    public static List<SearchResult> parseSearchResults(Reader reader) throws IOException, ParserConfigurationException, SAXException {
+        InputSource inputSource = new InputSource(reader);
+        NameFinderResultParser parser = new NameFinderResultParser();
+        Utils.parseSafeSAX(inputSource, parser);
+        return parser.getResult();
+    }
+
+    /**
+     * Data storage for search results.
+     */
+    public static class SearchResult {
+        private String name;
+        private String info;
+        private String nearestPlace;
+        private String description;
+        private double lat;
+        private double lon;
+        private int zoom;
+        private Bounds bounds;
+        private PrimitiveId osmId;
+
+        /**
+         * Returns the name.
+         * @return the name
+         */
+        public final String getName() {
+            return name;
+        }
+
+        /**
+         * Returns the info.
+         * @return the info
+         */
+        public final String getInfo() {
+            return info;
+        }
+
+        /**
+         * Returns the nearest place.
+         * @return the nearest place
+         */
+        public final String getNearestPlace() {
+            return nearestPlace;
+        }
+
+        /**
+         * Returns the description.
+         * @return the description
+         */
+        public final String getDescription() {
+            return description;
+        }
+
+        /**
+         * Returns the latitude.
+         * @return the latitude
+         */
+        public final double getLat() {
+            return lat;
+        }
+
+        /**
+         * Returns the longitude.
+         * @return the longitude
+         */
+        public final double getLon() {
+            return lon;
+        }
+
+        /**
+         * Returns the zoom.
+         * @return the zoom
+         */
+        public final int getZoom() {
+            return zoom;
+        }
+
+        /**
+         * Returns the bounds.
+         * @return the bounds
+         */
+        public final Bounds getBounds() {
+            return bounds;
+        }
+
+        /**
+         * Returns the OSM id.
+         * @return the OSM id
+         */
+        public final PrimitiveId getOsmId() {
+            return osmId;
+        }
+
+        /**
+         * Returns the download area.
+         * @return the download area
+         */
+        public Bounds getDownloadArea() {
+            return bounds != null ? bounds : OsmUrlToBounds.positionToBounds(lat, lon, zoom);
+        }
+    }
+
+    /**
+     * A very primitive parser for the name finder's output.
+     * Structure of xml described here:  http://wiki.openstreetmap.org/index.php/Name_finder
+     */
+    private static class NameFinderResultParser extends DefaultHandler {
+        private SearchResult currentResult;
+        private StringBuilder description;
+        private int depth;
+        private final List<SearchResult> data = new LinkedList<>();
+
+        /**
+         * Detect starting elements.
+         */
+        @Override
+        public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
+                throws SAXException {
+            depth++;
+            try {
+                if ("searchresults".equals(qName)) {
+                    // do nothing
+                } else if ("named".equals(qName) && (depth == 2)) {
+                    currentResult = new SearchResult();
+                    currentResult.name = atts.getValue("name");
+                    currentResult.info = atts.getValue("info");
+                    if (currentResult.info != null) {
+                        currentResult.info = tr(currentResult.info);
+                    }
+                    currentResult.lat = Double.parseDouble(atts.getValue("lat"));
+                    currentResult.lon = Double.parseDouble(atts.getValue("lon"));
+                    currentResult.zoom = Integer.parseInt(atts.getValue("zoom"));
+                    data.add(currentResult);
+                } else if ("description".equals(qName) && (depth == 3)) {
+                    description = new StringBuilder();
+                } else if ("named".equals(qName) && (depth == 4)) {
+                    // this is a "named" place in the nearest places list.
+                    String info = atts.getValue("info");
+                    if ("city".equals(info) || "town".equals(info) || "village".equals(info)) {
+                        currentResult.nearestPlace = atts.getValue("name");
+                    }
+                } else if ("place".equals(qName) && atts.getValue("lat") != null) {
+                    currentResult = new SearchResult();
+                    currentResult.name = atts.getValue("display_name");
+                    currentResult.description = currentResult.name;
+                    currentResult.info = atts.getValue("class");
+                    if (currentResult.info != null) {
+                        currentResult.info = tr(currentResult.info);
+                    }
+                    currentResult.nearestPlace = tr(atts.getValue("type"));
+                    currentResult.lat = Double.parseDouble(atts.getValue("lat"));
+                    currentResult.lon = Double.parseDouble(atts.getValue("lon"));
+                    String[] bbox = atts.getValue("boundingbox").split(",");
+                    currentResult.bounds = new Bounds(
+                            Double.parseDouble(bbox[0]), Double.parseDouble(bbox[2]),
+                            Double.parseDouble(bbox[1]), Double.parseDouble(bbox[3]));
+                    final String osmId = atts.getValue("osm_id");
+                    final String osmType = atts.getValue("osm_type");
+                    if (osmId != null && osmType != null) {
+                        currentResult.osmId = new SimplePrimitiveId(Long.parseLong(osmId), OsmPrimitiveType.from(osmType));
+                    }
+                    data.add(currentResult);
+                }
+            } catch (NumberFormatException x) {
+                Main.error(x); // SAXException does not chain correctly
+                throw new SAXException(x.getMessage(), x);
+            } catch (NullPointerException x) {
+                Main.error(x); // SAXException does not chain correctly
+                throw new SAXException(tr("Null pointer exception, possibly some missing tags."), x);
+            }
+        }
+
+        /**
+         * Detect ending elements.
+         */
+        @Override
+        public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
+            if ("description".equals(qName) && description != null) {
+                currentResult.description = description.toString();
+                description = null;
+            }
+            depth--;
+        }
+
+        /**
+         * Read characters for description.
+         */
+        @Override
+        public void characters(char[] data, int start, int length) throws SAXException {
+            if (description != null) {
+                description.append(data, start, length);
+            }
+        }
+
+        public List<SearchResult> getResult() {
+            return Collections.unmodifiableList(data);
+        }
+    }
+}
diff --git a/src/org/openstreetmap/josm/io/NoteReader.java b/src/org/openstreetmap/josm/io/NoteReader.java
index 94e6a9a..6fca43a 100644
--- a/src/org/openstreetmap/josm/io/NoteReader.java
+++ b/src/org/openstreetmap/josm/io/NoteReader.java
@@ -77,7 +77,7 @@ public class NoteReader {
                 return;
             case "osm-notes":
                 parseMode = NoteParseMode.DUMP;
-                notes = new ArrayList<>(10000);
+                notes = new ArrayList<>(10_000);
                 return;
             }
 
diff --git a/src/org/openstreetmap/josm/io/OsmExporter.java b/src/org/openstreetmap/josm/io/OsmExporter.java
index bb7bf23..44c7c21 100644
--- a/src/org/openstreetmap/josm/io/OsmExporter.java
+++ b/src/org/openstreetmap/josm/io/OsmExporter.java
@@ -128,7 +128,7 @@ public class OsmExporter extends FileExporter {
         try (
             OutputStream out = getOutputStream(file);
             Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);
-            OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, layer.data.getVersion());
+            OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, layer.data.getVersion())
         ) {
             layer.data.getReadLock().lock();
             try {
diff --git a/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java b/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
index 33ce484..51f843b 100644
--- a/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
@@ -28,13 +28,6 @@ import org.openstreetmap.josm.tools.XmlParsingException;
 public class OsmServerChangesetReader extends OsmServerReader {
 
     /**
-     * Constructs a new {@code OsmServerChangesetReader}.
-     */
-    public OsmServerChangesetReader() {
-        setDoAuthenticate(false);
-    }
-
-    /**
      * don't use - not implemented!
      */
     @Override
@@ -57,7 +50,7 @@ public class OsmServerChangesetReader extends OsmServerReader {
      * @param monitor a progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
      * @return the list of changesets read from the server
      * @throws IllegalArgumentException if query is null
-     * @throws OsmTransferException if something goes wrong w
+     * @throws OsmTransferException if something goes wrong
      */
     public List<Changeset> queryChangesets(ChangesetQuery query, ProgressMonitor monitor) throws OsmTransferException {
         CheckParameterUtil.ensureParameterNotNull(query, "query");
diff --git a/src/org/openstreetmap/josm/io/OsmServerReader.java b/src/org/openstreetmap/josm/io/OsmServerReader.java
index 124733b..d41dc93 100644
--- a/src/org/openstreetmap/josm/io/OsmServerReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerReader.java
@@ -15,6 +15,8 @@ import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.auth.CredentialsAgentException;
+import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.tools.HttpClient;
 
 /**
@@ -32,6 +34,17 @@ public abstract class OsmServerReader extends OsmConnection {
     protected boolean gpxParsedProperly;
 
     /**
+     * Constructs a new {@code OsmServerReader}.
+     */
+    public OsmServerReader() {
+        try {
+            doAuthenticate = OsmApi.isUsingOAuth() && CredentialsManager.getInstance().lookupOAuthAccessToken() != null;
+        } catch (CredentialsAgentException e) {
+            Main.warn(e);
+        }
+    }
+
+    /**
      * Open a connection to the given url and return a reader on the input stream
      * from that connection. In case of user cancel, return <code>null</code>.
      * Relative URL's are directed to API base URL.
@@ -198,7 +211,7 @@ public abstract class OsmServerReader extends OsmConnection {
      * @return The corresponding dataset
      * @throws OsmTransferException if any error occurs
      */
-    public abstract DataSet parseOsm(final ProgressMonitor progressMonitor) throws OsmTransferException;
+    public abstract DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException;
 
     /**
      * Download OSM Change files from somewhere
diff --git a/src/org/openstreetmap/josm/io/OverpassDownloadReader.java b/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
index be43043..cb4f8bc 100644
--- a/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
+++ b/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
@@ -3,18 +3,26 @@ package org.openstreetmap.josm.io;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.IOException;
 import java.io.InputStream;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -50,42 +58,53 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
         if (overpassQuery.isEmpty())
             return super.getRequestForBbox(lon1, lat1, lon2, lat2);
         else {
-            String realQuery = completeOverpassQuery(overpassQuery);
-            return "interpreter?data=" + Utils.encodeUrl(realQuery)
-                    + "&bbox=" + lon1 + ',' + lat1 + ',' + lon2 + ',' + lat2;
+            final String query = this.overpassQuery.replace("{{bbox}}", lat1 + "," + lon1 + "," + lat2 + "," + lon2);
+            final String expandedOverpassQuery = expandExtendedQueries(query);
+            return "interpreter?data=" + Utils.encodeUrl(expandedOverpassQuery);
         }
     }
 
-    private static String completeOverpassQuery(String query) {
-        int firstColon = query.indexOf(';');
-        if (firstColon == -1) {
-            return "[bbox];" + query;
-        }
-        int bboxPos = query.indexOf("[bbox");
-        if (bboxPos > -1 && bboxPos < firstColon) {
-            return query;
-        }
-
-        int bracketCount = 0;
-        int pos = 0;
-        for (; pos < firstColon; ++pos) {
-            if (query.charAt(pos) == '[')
-                ++bracketCount;
-            else if (query.charAt(pos) == ']')
-                --bracketCount;
-            else if (bracketCount == 0) {
-                if (!Character.isWhitespace(query.charAt(pos)))
-                    break;
+    /**
+     * Evaluates some features of overpass turbo extended query syntax.
+     * See https://wiki.openstreetmap.org/wiki/Overpass_turbo/Extended_Overpass_Turbo_Queries
+     * @param query unexpanded query
+     * @return expanded query
+     */
+    static String expandExtendedQueries(String query) {
+        final StringBuffer sb = new StringBuffer();
+        final Matcher matcher = Pattern.compile("\\{\\{(geocodeArea):([^}]+)\\}\\}").matcher(query);
+        while (matcher.find()) {
+            try {
+                switch (matcher.group(1)) {
+                    case "geocodeArea":
+                        matcher.appendReplacement(sb, geocodeArea(matcher.group(2)));
+                        break;
+                    default:
+                        Main.warn("Unsupported syntax: " + matcher.group(1));
+                }
+            } catch (UncheckedParseException ex) {
+                final String msg = tr("Failed to evaluate {0}", matcher.group());
+                Main.warn(ex, msg);
+                matcher.appendReplacement(sb, "// " + msg + "\n");
             }
         }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
 
-        if (pos < firstColon) {
-            // We start with a statement, not with declarations
-            return "[bbox];" + query;
+    private static String geocodeArea(String area) {
+        // Offsets defined in https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL#By_element_id
+        final EnumMap<OsmPrimitiveType, Long> idOffset = new EnumMap<>(OsmPrimitiveType.class);
+        idOffset.put(OsmPrimitiveType.NODE, 0L);
+        idOffset.put(OsmPrimitiveType.WAY, 2_400_000_000L);
+        idOffset.put(OsmPrimitiveType.RELATION, 3_600_000_000L);
+        try {
+            final List<NameFinder.SearchResult> results = NameFinder.queryNominatim(area);
+            final PrimitiveId osmId = results.iterator().next().getOsmId();
+            return String.format("area(%d)", osmId.getUniqueId() + idOffset.get(osmId.getType()));
+        } catch (IOException | NoSuchElementException ex) {
+            throw new UncheckedParseException(ex);
         }
-
-        // We start with declarations. Add just one more declaration in this case.
-        return "[bbox]" + query;
     }
 
     @Override
@@ -130,12 +149,10 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
         return new OsmReader() {
             @Override
             protected void parseUnknown(boolean printWarning) throws XMLStreamException {
-                if ("remark".equals(parser.getLocalName())) {
-                    if (parser.getEventType() == XMLStreamConstants.START_ELEMENT) {
-                        final String text = parser.getElementText();
-                        if (text.contains("runtime error")) {
-                            throw new XMLStreamException(text);
-                        }
+                if ("remark".equals(parser.getLocalName()) && parser.getEventType() == XMLStreamConstants.START_ELEMENT) {
+                    final String text = parser.getElementText();
+                    if (text.contains("runtime error")) {
+                        throw new XMLStreamException(text);
                     }
                 }
                 super.parseUnknown(printWarning);
@@ -149,7 +166,7 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
         DataSet ds = super.parseOsm(progressMonitor);
 
         // add bounds if necessary (note that Overpass API does not return bounds in the response XML)
-        if (ds != null && ds.dataSources.isEmpty()) {
+        if (ds != null && ds.dataSources.isEmpty() && overpassQuery.contains("{{bbox}}")) {
             if (crosses180th) {
                 Bounds bounds = new Bounds(lat1, lon1, lat2, 180.0);
                 DataSource src = new DataSource(bounds, getBaseUrl());
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
index b65518e..84de074 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
@@ -191,6 +191,9 @@ public class AddTagsDialog extends ExtendedDialog {
             public String getToolTipText(MouseEvent event) {
                 int r = rowAtPoint(event.getPoint());
                 int c = columnAtPoint(event.getPoint());
+                if (r < 0 || c < 0) {
+                    return getToolTipText();
+                }
                 Object o = getValueAt(r, c);
                 if (c == 1 || c == 2) return o.toString();
                 if (c == 3) return ((ExistingValues) o).getToolTip();
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
index 62d9f26..031417b 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
@@ -139,7 +139,7 @@ public class RemoteControlHttpsServer extends Thread {
             throws GeneralSecurityException, IOException {
         X509CertInfo info = new X509CertInfo();
         Date from = new Date();
-        Date to = new Date(from.getTime() + days * 86400000L);
+        Date to = new Date(from.getTime() + days * 86_400_000L);
         CertificateValidity interval = new CertificateValidity(from, to);
         BigInteger sn = new BigInteger(64, new SecureRandom());
         X500Name owner = new X500Name(dn);
@@ -206,7 +206,7 @@ public class RemoteControlHttpsServer extends Thread {
         Path path = dir.resolve(KEYSTORE_FILENAME);
         Files.createDirectories(dir);
 
-        if (!Files.exists(path)) {
+        if (!path.toFile().exists()) {
             Main.debug("No keystore found, creating a new one");
 
             // Create new keystore like previous one generated with JDK keytool as follows:
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
index 2952bfa..cd83e6d 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
@@ -145,12 +145,10 @@ public abstract class RequestHandler {
          * older versions of WMSPlugin.
          */
         PermissionPrefWithDefault permissionPref = getPermissionPref();
-        if (permissionPref != null && permissionPref.pref != null) {
-            if (!Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) {
-                String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand);
-                Main.info(err);
-                throw new RequestHandlerForbiddenException(err);
-            }
+        if (permissionPref != null && permissionPref.pref != null && !Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) {
+            String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand);
+            Main.info(err);
+            throw new RequestHandlerForbiddenException(err);
         }
 
         /* Does the user want to confirm everything?
@@ -178,10 +176,15 @@ public abstract class RequestHandler {
      * Set request URL and parse args.
      *
      * @param url The request URL.
+     * @throws RequestHandlerBadRequestException if request URL is invalid
      */
-    public void setUrl(String url) {
+    public void setUrl(String url) throws RequestHandlerBadRequestException {
         this.request = url;
-        parseArgs();
+        try {
+            parseArgs();
+        } catch (URISyntaxException e) {
+            throw new RequestHandlerBadRequestException(e);
+        }
     }
 
     /**
@@ -189,13 +192,10 @@ public abstract class RequestHandler {
      * The result will be stored in {@code this.args}.
      *
      * Can be overridden by subclass.
+     * @throws URISyntaxException if request URL is invalid
      */
-    protected void parseArgs() {
-        try {
-            this.args = getRequestParameter(new URI(this.request));
-        } catch (URISyntaxException ex) {
-            throw new RuntimeException(ex);
-        }
+    protected void parseArgs() throws URISyntaxException {
+        this.args = getRequestParameter(new URI(this.request));
     }
 
     /**
@@ -310,6 +310,11 @@ public abstract class RequestHandler {
     }
 
     public static class RequestHandlerErrorException extends RequestHandlerException {
+
+        /**
+         * Constructs a new {@code RequestHandlerErrorException}.
+         * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+         */
         public RequestHandlerErrorException(Throwable cause) {
             super(cause);
         }
@@ -317,18 +322,38 @@ public abstract class RequestHandler {
 
     public static class RequestHandlerBadRequestException extends RequestHandlerException {
 
+        /**
+         * Constructs a new {@code RequestHandlerBadRequestException}.
+         * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
+         */
         public RequestHandlerBadRequestException(String message) {
             super(message);
         }
 
+        /**
+         * Constructs a new {@code RequestHandlerBadRequestException}.
+         * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+         */
+        public RequestHandlerBadRequestException(Throwable cause) {
+            super(cause);
+        }
+
+        /**
+         * Constructs a new {@code RequestHandlerBadRequestException}.
+         * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
+         * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+         */
         public RequestHandlerBadRequestException(String message, Throwable cause) {
             super(message, cause);
         }
     }
 
     public static class RequestHandlerForbiddenException extends RequestHandlerException {
-        private static final long serialVersionUID = 2263904699747115423L;
 
+        /**
+         * Constructs a new {@code RequestHandlerForbiddenException}.
+         * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
+         */
         public RequestHandlerForbiddenException(String message) {
             super(message);
         }
@@ -336,7 +361,7 @@ public abstract class RequestHandler {
 
     public abstract static class RawURLParseRequestHandler extends RequestHandler {
         @Override
-        protected void parseArgs() {
+        protected void parseArgs() throws URISyntaxException {
             Map<String, String> args = new HashMap<>();
             if (request.indexOf('?') != -1) {
                 String query = request.substring(request.indexOf('?') + 1);
diff --git a/src/org/openstreetmap/josm/io/session/SessionReader.java b/src/org/openstreetmap/josm/io/session/SessionReader.java
index f1bf245..ac5359e 100644
--- a/src/org/openstreetmap/josm/io/session/SessionReader.java
+++ b/src/org/openstreetmap/josm/io/session/SessionReader.java
@@ -291,6 +291,12 @@ public class SessionReader {
         public List<LayerDependency> getLayerDependencies() {
             return layerDependencies;
         }
+
+        @Override
+        public String toString() {
+            return "ImportSupport [layerName=" + layerName + ", layerIndex=" + layerIndex + ", layerDependencies="
+                    + layerDependencies + ", inZipPath=" + inZipPath + ']';
+        }
     }
 
     public static class LayerDependency {
@@ -488,7 +494,10 @@ public class SessionReader {
                 Exception exception = null;
                 try {
                     layer = imp.load(e, support, progressMonitor.createSubTaskMonitor(1, false));
-                } catch (IllegalDataException | IOException ex) {
+                    if (layer == null) {
+                        throw new IllegalStateException("Importer " + imp + " returned null for " + support);
+                    }
+                } catch (IllegalDataException | IllegalStateException | IOException ex) {
                     exception = ex;
                 }
                 if (exception != null) {
@@ -510,7 +519,6 @@ public class SessionReader {
                     }
                 }
 
-                if (layer == null) throw new RuntimeException();
                 layersMap.put(idx, layer);
             }
             progressMonitor.worked(1);
diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
index 661add2..19f301b 100644
--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
@@ -37,6 +37,7 @@ import java.util.TreeSet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 import java.util.jar.JarFile;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -237,13 +238,12 @@ public final class PluginHandler {
     /**
      * All installed and loaded plugins (resp. their main classes)
      */
-    public static final Collection<PluginProxy> pluginList = new LinkedList<>();
+    static final Collection<PluginProxy> pluginList = new LinkedList<>();
 
     /**
      * All exceptions that occured during plugin loading
-     * @since 8938
      */
-    public static final Map<String, Exception> pluginLoadingExceptions = new HashMap<>();
+    static final Map<String, Exception> pluginLoadingExceptions = new HashMap<>();
 
     /**
      * Global plugin ClassLoader.
@@ -266,6 +266,15 @@ public final class PluginHandler {
 
     private static PluginDownloadTask pluginDownloadTask;
 
+    /**
+     * Returns the list of currently installed and loaded plugins.
+     * @return the list of currently installed and loaded plugins
+     * @since 10982
+     */
+    public static List<PluginInformation> getPlugins() {
+        return pluginList.stream().map(PluginProxy::getPluginInformation).collect(Collectors.toList());
+    }
+
     public static Collection<ClassLoader> getResourceClassLoaders() {
         return Collections.unmodifiableCollection(sources);
     }
diff --git a/src/org/openstreetmap/josm/tools/AudioPlayer.java b/src/org/openstreetmap/josm/tools/AudioPlayer.java
index 2ddb565..31c0334 100644
--- a/src/org/openstreetmap/josm/tools/AudioPlayer.java
+++ b/src/org/openstreetmap/josm/tools/AudioPlayer.java
@@ -311,8 +311,8 @@ public final class AudioPlayer extends Thread {
                                 double calibratedOffset = offset * calibration;
                                 bytesPerSecond = audioFormat.getFrameRate() /* frames per second */
                                 * audioFormat.getFrameSize() /* bytes per frame */;
-                                if (speed * bytesPerSecond > 256000.0) {
-                                    speed = 256000 / bytesPerSecond;
+                                if (speed * bytesPerSecond > 256_000.0) {
+                                    speed = 256_000 / bytesPerSecond;
                                 }
                                 if (calibratedOffset > 0.0) {
                                     long bytesToSkip = (long) (calibratedOffset /* seconds (double) */ * bytesPerSecond);
diff --git a/src/org/openstreetmap/josm/tools/Diff.java b/src/org/openstreetmap/josm/tools/Diff.java
index 08d6379..0f254cf 100644
--- a/src/org/openstreetmap/josm/tools/Diff.java
+++ b/src/org/openstreetmap/josm/tools/Diff.java
@@ -791,7 +791,8 @@ public class Diff {
                 start = i;
                 otherStart = j;
 
-                for (;;) {
+                boolean loop = true;
+                while (loop) {
                     /* Now find the end of this run of changes.  */
 
                     while (i < iEnd && changed[1+i]) {
@@ -818,7 +819,7 @@ public class Diff {
                            to keep in synch.  */
                         ++j;
                     } else {
-                        break;
+                        loop = false;
                     }
                 }
 
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index 79a4105..4dc61d7 100644
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
@@ -402,7 +402,7 @@ public final class I18n {
         // http://docs.oracle.com/javase/8/docs/technotes/guides/intl/enhancements.8.html#cldr
         // FIXME: This can be removed after we switch to a minimal version of Java that enables CLDR by default
         // or includes all languages we need in the JRE. See http://openjdk.java.net/jeps/252 for Java 9
-        Utils.updateSystemProperty("java.locale.providers", "JRE,CLDR");
+        System.setProperty("java.locale.providers", "JRE,CLDR"); // Don't call Utils.updateSystemProperty to avoid spurious log at startup
 
         //languages.put("ar", PluralMode.MODE_AR);
         languages.put("ast", PluralMode.MODE_NOTONE);
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index ccb28c3..68320bf 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -765,6 +765,16 @@ public class ImageProvider {
             "^data:([a-zA-Z]+/[a-zA-Z+]+)?(;base64)?,(.+)$");
 
     /**
+     * Clears the internal image cache.
+     * @since 11021
+     */
+    public static void clearCache() {
+        synchronized (cache) {
+            cache.clear();
+        }
+    }
+
+    /**
      * Internal implementation of the image request.
      *
      * @param additionalClassLoaders the list of class loaders to use
diff --git a/src/org/openstreetmap/josm/tools/ListenerList.java b/src/org/openstreetmap/josm/tools/ListenerList.java
index b911e4d..a78aa4a 100644
--- a/src/org/openstreetmap/josm/tools/ListenerList.java
+++ b/src/org/openstreetmap/josm/tools/ListenerList.java
@@ -206,7 +206,7 @@ public class ListenerList<T> {
             super.failRemove(listener);
         }
 
-        private static void dumpStack(StackTraceElement[] stackTraceElements) {
+        private static void dumpStack(StackTraceElement ... stackTraceElements) {
             if (stackTraceElements == null) {
                 Main.trace("  - (no trace recorded)");
             } else {
diff --git a/src/org/openstreetmap/josm/tools/Logging.java b/src/org/openstreetmap/josm/tools/Logging.java
index d918678..d7e7fd7 100644
--- a/src/org/openstreetmap/josm/tools/Logging.java
+++ b/src/org/openstreetmap/josm/tools/Logging.java
@@ -54,6 +54,9 @@ public final class Logging {
         LOGGER.setLevel(Level.ALL);
         LOGGER.setUseParentHandlers(false);
 
+        // for a more concise logging output via java.util.logging.SimpleFormatter
+        Utils.updateSystemProperty("java.util.logging.SimpleFormatter.format", "%1$tF %1$tT.%1$tL %4$s: %5$s%6$s%n");
+
         ConsoleHandler stderr = new ConsoleHandler();
         LOGGER.addHandler(stderr);
         stderr.setLevel(LEVEL_WARN);
diff --git a/src/org/openstreetmap/josm/tools/OpenBrowser.java b/src/org/openstreetmap/josm/tools/OpenBrowser.java
index ff08bcf..6110fa0 100644
--- a/src/org/openstreetmap/josm/tools/OpenBrowser.java
+++ b/src/org/openstreetmap/josm/tools/OpenBrowser.java
@@ -47,7 +47,7 @@ public final class OpenBrowser {
                 if (Main.isPlatformWindows()) {
                     // Desktop API works fine under Windows, so we don't try any fallback in case of I/O exceptions because it's not API's fault
                     Desktop.getDesktop().browse(uri);
-                } else if (Main.platform instanceof PlatformHookUnixoid) {
+                } else if (Main.platform instanceof PlatformHookUnixoid || Main.platform instanceof PlatformHookOsx) {
                     // see #5629 #5108 #9568
                     Main.platform.openUrl(uri.toString());
                 } else {
diff --git a/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java b/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
index 8832885..436c7cb 100644
--- a/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
+++ b/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
@@ -69,11 +69,7 @@ public final class OverpassTurboQueryWizard {
             if (Boolean.FALSE.equals(result)) {
                 throw new UncheckedParseException();
             }
-            String query = (String) result;
-            if (query != null) {
-                query = query.replace("[bbox:{{bbox}}]", "");
-            }
-            return query;
+            return (String) result;
         } catch (NoSuchMethodException e) {
             throw new IllegalStateException(e);
         } catch (ScriptException e) {
diff --git a/src/org/openstreetmap/josm/tools/PlatformHook.java b/src/org/openstreetmap/josm/tools/PlatformHook.java
index fd3019d..5346790 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHook.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHook.java
@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools;
 
+import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.io.IOException;
 import java.security.KeyStore;
@@ -22,7 +23,9 @@ public interface PlatformHook {
       * Reason: On OSX we need to inform the Swing libraries
       * that we want to be integrated with the OS before we setup our GUI.
       */
-    void preStartupHook();
+    default void preStartupHook() {
+        // Do nothing
+    }
 
     /**
       * The afterPrefStartupHook will be called early, but after
@@ -30,7 +33,9 @@ public interface PlatformHook {
       * command line arguments is finished.
       * It is guaranteed to be called before the GUI setup has started.
       */
-    void afterPrefStartupHook();
+    default void afterPrefStartupHook() {
+        // Do nothing
+    }
 
     /**
       * The startupHook will be called early, but after the GUI
@@ -39,7 +44,9 @@ public interface PlatformHook {
       * Reason: On OSX we need to register some callbacks with the
       * OS, so we'll receive events from the system menu.
       */
-    void startupHook();
+    default void startupHook() {
+        // Do nothing
+    }
 
     /**
       * The openURL hook will be used to open an URL in the
@@ -78,14 +85,22 @@ public interface PlatformHook {
       * Tooltips are usually not system dependent, unless the
       * JVM is too dumb to provide correct names for all the keys.
       *
-      * Another reason not to use the implementation in the *nix
-      * hook are LAFs that don't understand HTML, such as the OSX LAFs.
+      * Some LAFs don't understand HTML, such as the OSX LAFs.
       *
      * @param name Tooltip text to display
      * @param sc Shortcut associated (to display accelerator between parenthesis)
      * @return Full tooltip text (name + accelerator)
       */
-    String makeTooltip(String name, Shortcut sc);
+    default String makeTooltip(String name, Shortcut sc) {
+        StringBuilder result = new StringBuilder();
+        result.append("<html>").append(name);
+        if (sc != null && !sc.getKeyText().isEmpty()) {
+            result.append(" <font size='-2'>(")
+                  .append(sc.getKeyText())
+                  .append(")</font>");
+        }
+        return result.append(" </html>").toString();
+    }
 
     /**
      * Returns the default LAF to be used on this platform to look almost as a native application.
@@ -97,7 +112,10 @@ public interface PlatformHook {
      * Determines if the platform allows full-screen.
      * @return {@code true} if full screen is allowed, {@code false} otherwise
      */
-    boolean canFullscreen();
+    default boolean canFullscreen() {
+        return !GraphicsEnvironment.isHeadless() &&
+                GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().isFullScreenSupported();
+    }
 
     /**
      * Renames a file.
@@ -105,7 +123,9 @@ public interface PlatformHook {
      * @param to Target file
      * @return {@code true} if the file has been renamed, {@code false} otherwise
      */
-    boolean rename(File from, File to);
+    default boolean rename(File from, File to) {
+        return from.renameTo(to);
+    }
 
     /**
      * Returns a detailed OS description (at least family + version).
@@ -125,8 +145,11 @@ public interface PlatformHook {
      * @throws NoSuchAlgorithmException in case of error
      * @since 7343
      */
-    boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
-            throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException;
+    default boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
+            throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
+        // TODO setup HTTPS certificate on Unix and OS X systems
+        return false;
+    }
 
     /**
      * Returns the platform-dependent default cache directory.
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
index 2af30cb..c704875 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
@@ -27,9 +27,9 @@ import org.xml.sax.SAXException;
  * {@code PlatformHook} implementation for Apple Mac OS X systems.
  * @since 1023
  */
-public class PlatformHookOsx extends PlatformHookUnixoid implements InvocationHandler {
+public class PlatformHookOsx implements PlatformHook, InvocationHandler {
 
-    private static PlatformHookOsx ivhandler = new PlatformHookOsx();
+    private static final PlatformHookOsx ivhandler = new PlatformHookOsx();
 
     @Override
     public void preStartupHook() {
@@ -144,7 +144,7 @@ public class PlatformHookOsx extends PlatformHookUnixoid implements InvocationHa
             }
             break;
         case "handleQuitRequestWith":
-            boolean closed = Main.exitJosm(false, 0);
+            boolean closed = Main.exitJosm(false, 0, null);
             if (args[1] != null) {
                 try {
                     args[1].getClass().getDeclaredMethod(closed ? "performQuit" : "cancelQuit").invoke(args[1]);
@@ -365,16 +365,19 @@ public class PlatformHookOsx extends PlatformHookUnixoid implements InvocationHa
 
     @Override
     public File getDefaultCacheDirectory() {
-        return new File(System.getProperty("user.home")+"/Library/Caches", "JOSM");
+        return new File(System.getProperty("user.home")+"/Library/Caches",
+                Main.pref.getJOSMDirectoryBaseName());
     }
 
     @Override
     public File getDefaultPrefDirectory() {
-        return new File(System.getProperty("user.home")+"/Library/Preferences", "JOSM");
+        return new File(System.getProperty("user.home")+"/Library/Preferences",
+                Main.pref.getJOSMDirectoryBaseName());
     }
 
     @Override
     public File getDefaultUserDataDirectory() {
-        return new File(System.getProperty("user.home")+"/Library", "JOSM");
+        return new File(System.getProperty("user.home")+"/Library",
+                Main.pref.getJOSMDirectoryBaseName());
     }
 }
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
index 31303a3..32c0011 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
@@ -5,40 +5,23 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Desktop;
 import java.awt.Dimension;
-import java.awt.GraphicsEnvironment;
 import java.awt.event.KeyEvent;
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
 import java.util.Locale;
-import java.util.Properties;
 
 import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences.pref;
-import org.openstreetmap.josm.data.Preferences.writeExplicitly;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
@@ -50,51 +33,6 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
  */
 public class PlatformHookUnixoid implements PlatformHook {
 
-    /**
-     * Simple data class to hold information about a font.
-     *
-     * Used for fontconfig.properties files.
-     */
-    public static class FontEntry {
-        /**
-         * The character subset. Basically a free identifier, but should be unique.
-         */
-        @pref
-        public String charset;
-
-        /**
-         * Platform font name.
-         */
-        @pref
-        @writeExplicitly
-        public String name = "";
-
-        /**
-         * File name.
-         */
-        @pref
-        @writeExplicitly
-        public String file = "";
-
-        /**
-         * Constructs a new {@code FontEntry}.
-         */
-        public FontEntry() {
-        }
-
-        /**
-         * Constructs a new {@code FontEntry}.
-         * @param charset The character subset. Basically a free identifier, but should be unique
-         * @param name Platform font name
-         * @param file File name
-         */
-        public FontEntry(String charset, String name, String file) {
-            this.charset = charset;
-            this.name = name;
-            this.file = file;
-        }
-    }
-
     private String osDescription;
 
     @Override
@@ -106,16 +44,6 @@ public class PlatformHookUnixoid implements PlatformHook {
     }
 
     @Override
-    public void afterPrefStartupHook() {
-        // Do nothing
-    }
-
-    @Override
-    public void startupHook() {
-        // Do nothing
-    }
-
-    @Override
     public void openUrl(String url) throws IOException {
         for (String program : Main.pref.getCollection("browser.unix",
                 Arrays.asList("xdg-open", "#DESKTOP#", "$BROWSER", "gnome-open", "kfmclient openURL", "firefox"))) {
@@ -150,38 +78,11 @@ public class PlatformHookUnixoid implements PlatformHook {
         // CHECKSTYLE.ON: LineLength
     }
 
-    /**
-     * This should work for all platforms. Yeah, should.
-     * See PlatformHook.java for a list of reasons why this is implemented here...
-     */
-    @Override
-    public String makeTooltip(String name, Shortcut sc) {
-        StringBuilder result = new StringBuilder();
-        result.append("<html>").append(name);
-        if (sc != null && !sc.getKeyText().isEmpty()) {
-            result.append(" <font size='-2'>(")
-                  .append(sc.getKeyText())
-                  .append(")</font>");
-        }
-        return result.append(" </html>").toString();
-    }
-
     @Override
     public String getDefaultStyle() {
         return "javax.swing.plaf.metal.MetalLookAndFeel";
     }
 
-    @Override
-    public boolean canFullscreen() {
-        return !GraphicsEnvironment.isHeadless() &&
-                GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().isFullScreenSupported();
-    }
-
-    @Override
-    public boolean rename(File from, File to) {
-        return from.renameTo(to);
-    }
-
     /**
      * Determines if the distribution is Debian or Ubuntu, or a derivative.
      * @return {@code true} if the distribution is Debian, Ubuntu or Mint, {@code false} otherwise
@@ -216,9 +117,9 @@ public class PlatformHookUnixoid implements PlatformHook {
     public static String getPackageDetails(String ... packageNames) {
         try {
             // CHECKSTYLE.OFF: SingleSpaceSeparator
-            boolean dpkg = Files.exists(Paths.get("/usr/bin/dpkg-query"));
-            boolean eque = Files.exists(Paths.get("/usr/bin/equery"));
-            boolean rpm  = Files.exists(Paths.get("/bin/rpm"));
+            boolean dpkg = Paths.get("/usr/bin/dpkg-query").toFile().exists();
+            boolean eque = Paths.get("/usr/bin/equery").toFile().exists();
+            boolean rpm  = Paths.get("/bin/rpm").toFile().exists();
             // CHECKSTYLE.ON: SingleSpaceSeparator
             if (dpkg || rpm || eque) {
                 for (String packageName : packageNames) {
@@ -389,7 +290,7 @@ public class PlatformHookUnixoid implements PlatformHook {
             String result = null;
             if (path != null) {
                 Path p = Paths.get(path);
-                if (Files.exists(p)) {
+                if (p.toFile().exists()) {
                     try (BufferedReader reader = Files.newBufferedReader(p, StandardCharsets.UTF_8)) {
                         String id = null;
                         String release = null;
@@ -467,156 +368,68 @@ public class PlatformHookUnixoid implements PlatformHook {
         });
     }
 
-    @Override
-    public boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
-            throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
-        // TODO setup HTTPS certificate on Unix systems
-        return false;
+    /**
+     * Get the dot directory <code>~/.josm</code>.
+     * @return the dot directory
+     */
+    private static File getDotDirectory() {
+        String dirName = "." + Main.pref.getJOSMDirectoryBaseName().toLowerCase(Locale.ENGLISH);
+        return new File(System.getProperty("user.home"), dirName);
+    }
+
+    /**
+     * Returns true if the dot directory should be used for storing preferences,
+     * cache and user data.
+     * Currently this is the case, if the dot directory already exists.
+     * @return true if the dot directory should be used
+     */
+    private boolean useDotDirectory() {
+        return getDotDirectory().exists();
     }
 
     @Override
     public File getDefaultCacheDirectory() {
-        return new File(Main.pref.getUserDataDirectory(), "cache");
+        if (useDotDirectory()) {
+            return new File(getDotDirectory(), "cache");
+        } else {
+            String xdgCacheDir = System.getenv("XDG_CACHE_HOME");
+            if (xdgCacheDir != null && !xdgCacheDir.isEmpty()) {
+                return new File(xdgCacheDir, Main.pref.getJOSMDirectoryBaseName());
+            } else {
+                return new File(System.getProperty("user.home") + File.separator +
+                        ".cache" + File.separator + Main.pref.getJOSMDirectoryBaseName());
+            }
+        }
     }
 
     @Override
     public File getDefaultPrefDirectory() {
-        return new File(System.getProperty("user.home"), ".josm");
+        if (useDotDirectory()) {
+            return getDotDirectory();
+        } else {
+            String xdgConfigDir = System.getenv("XDG_CONFIG_HOME");
+            if (xdgConfigDir != null && !xdgConfigDir.isEmpty()) {
+                return new File(xdgConfigDir, Main.pref.getJOSMDirectoryBaseName());
+            } else {
+                return new File(System.getProperty("user.home") + File.separator +
+                        ".config" + File.separator + Main.pref.getJOSMDirectoryBaseName());
+            }
+        }
     }
 
     @Override
     public File getDefaultUserDataDirectory() {
-        // Use preferences directory by default
-        return Main.pref.getPreferencesDirectory();
-    }
-
-    /**
-     * <p>Add more fallback fonts to the Java runtime, in order to get
-     * support for more scripts.</p>
-     *
-     * <p>The font configuration in Java doesn't include some Indic scripts,
-     * even though MS Windows ships with fonts that cover these unicode ranges.</p>
-     *
-     * <p>To fix this, the fontconfig.properties template is copied to the JOSM
-     * cache folder. Then, the additional entries are added to the font
-     * configuration. Finally the system property "sun.awt.fontconfig" is set
-     * to the customized fontconfig.properties file.</p>
-     *
-     * <p>This is a crude hack, but better than no font display at all for these languages.
-     * There is no guarantee, that the template file
-     * ($JAVA_HOME/lib/fontconfig.properties.src) matches the default
-     * configuration (which is in a binary format).
-     * Furthermore, the system property "sun.awt.fontconfig" is undocumented and
-     * may no longer work in future versions of Java.</p>
-     *
-     * <p>Related Java bug: <a href="https://bugs.openjdk.java.net/browse/JDK-8008572">JDK-8008572</a></p>
-     *
-     * @param templateFileName file name of the fontconfig.properties template file
-     */
-    protected void extendFontconfig(String templateFileName) {
-        String customFontconfigFile = Main.pref.get("fontconfig.properties", null);
-        if (customFontconfigFile != null) {
-            Utils.updateSystemProperty("sun.awt.fontconfig", customFontconfigFile);
-            return;
-        }
-        if (!Main.pref.getBoolean("font.extended-unicode", true))
-            return;
-
-        String javaLibPath = System.getProperty("java.home") + File.separator + "lib";
-        Path templateFile = FileSystems.getDefault().getPath(javaLibPath, templateFileName);
-        if (!Files.isReadable(templateFile)) {
-            Main.warn("extended font config - unable to find font config template file "+templateFile.toString());
-            return;
-        }
-        try (FileInputStream fis = new FileInputStream(templateFile.toFile())) {
-            Properties props = new Properties();
-            props.load(fis);
-            byte[] content = Files.readAllBytes(templateFile);
-            File cachePath = Main.pref.getCacheDirectory();
-            Path fontconfigFile = cachePath.toPath().resolve("fontconfig.properties");
-            OutputStream os = Files.newOutputStream(fontconfigFile);
-            os.write(content);
-            try (Writer w = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) {
-                Collection<FontEntry> extrasPref = Main.pref.getListOfStructs(
-                        "font.extended-unicode.extra-items", getAdditionalFonts(), FontEntry.class);
-                Collection<FontEntry> extras = new ArrayList<>();
-                w.append("\n\n# Added by JOSM to extend unicode coverage of Java font support:\n\n");
-                List<String> allCharSubsets = new ArrayList<>();
-                for (FontEntry entry: extrasPref) {
-                    Collection<String> fontsAvail = getInstalledFonts();
-                    if (fontsAvail != null && fontsAvail.contains(entry.file.toUpperCase(Locale.ENGLISH))) {
-                        if (!allCharSubsets.contains(entry.charset)) {
-                            allCharSubsets.add(entry.charset);
-                            extras.add(entry);
-                        } else {
-                            Main.trace("extended font config - already registered font for charset ''{0}'' - skipping ''{1}''",
-                                    entry.charset, entry.name);
-                        }
-                    } else {
-                        Main.trace("extended font config - Font ''{0}'' not found on system - skipping", entry.name);
-                    }
-                }
-                for (FontEntry entry: extras) {
-                    allCharSubsets.add(entry.charset);
-                    if ("".equals(entry.name)) {
-                        continue;
-                    }
-                    String key = "allfonts." + entry.charset;
-                    String value = entry.name;
-                    String prevValue = props.getProperty(key);
-                    if (prevValue != null && !prevValue.equals(value)) {
-                        Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value);
-                    }
-                    w.append(key + '=' + value + '\n');
-                }
-                w.append('\n');
-                for (FontEntry entry: extras) {
-                    if ("".equals(entry.name) || "".equals(entry.file)) {
-                        continue;
-                    }
-                    String key = "filename." + entry.name.replace(' ', '_');
-                    String value = entry.file;
-                    String prevValue = props.getProperty(key);
-                    if (prevValue != null && !prevValue.equals(value)) {
-                        Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value);
-                    }
-                    w.append(key + '=' + value + '\n');
-                }
-                w.append('\n');
-                String fallback = props.getProperty("sequence.fallback");
-                if (fallback != null) {
-                    w.append("sequence.fallback=" + fallback + ',' + Utils.join(",", allCharSubsets) + '\n');
-                } else {
-                    w.append("sequence.fallback=" + Utils.join(",", allCharSubsets) + '\n');
-                }
+        if (useDotDirectory()) {
+            return getDotDirectory();
+        } else {
+            String xdgDataDir = System.getenv("XDG_DATA_HOME");
+            if (xdgDataDir != null && !xdgDataDir.isEmpty()) {
+                return new File(xdgDataDir, Main.pref.getJOSMDirectoryBaseName());
+            } else {
+                return new File(System.getProperty("user.home") + File.separator +
+                        ".local" + File.separator + "share" + File.separator + Main.pref.getJOSMDirectoryBaseName());
             }
-            Utils.updateSystemProperty("sun.awt.fontconfig", fontconfigFile.toString());
-        } catch (IOException ex) {
-            Main.error(ex);
         }
     }
 
-    /**
-     * Get a list of fonts that are installed on the system.
-     *
-     * Must be done without triggering the Java Font initialization.
-     * (See {@link #extendFontconfig(java.lang.String)}, have to set system
-     * property first, which is then read by sun.awt.FontConfiguration upon initialization.)
-     *
-     * @return list of file names
-     */
-    public Collection<String> getInstalledFonts() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Get default list of additional fonts to add to the configuration.
-     *
-     * Java will choose thee first font in the list that can render a certain character.
-     *
-     * @return list of FontEntry objects
-     */
-    public Collection<FontEntry> getAdditionalFonts() {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
index 2dac887..601a5df 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
@@ -28,8 +28,14 @@ import static java.awt.event.KeyEvent.VK_Z;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.GraphicsEnvironment;
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.DirectoryStream;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -50,20 +56,63 @@ import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
+import java.util.Properties;
 
 import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 
 /**
   * {@code PlatformHook} implementation for Microsoft Windows systems.
   * @since 1023
   */
-public class PlatformHookWindows extends PlatformHookUnixoid {
+public class PlatformHookWindows implements PlatformHook {
 
-    @Override
-    public void startupHook() {
-        // Do nothing
+    /**
+     * Simple data class to hold information about a font.
+     *
+     * Used for fontconfig.properties files.
+     */
+    public static class FontEntry {
+        /**
+         * The character subset. Basically a free identifier, but should be unique.
+         */
+        @Preferences.pref
+        public String charset;
+
+        /**
+         * Platform font name.
+         */
+        @Preferences.pref
+        @Preferences.writeExplicitly
+        public String name = "";
+
+        /**
+         * File name.
+         */
+        @Preferences.pref
+        @Preferences.writeExplicitly
+        public String file = "";
+
+        /**
+         * Constructs a new {@code FontEntry}.
+         */
+        public FontEntry() {
+            // Default constructor needed for construction by reflection
+        }
+
+        /**
+         * Constructs a new {@code FontEntry}.
+         * @param charset The character subset. Basically a free identifier, but should be unique
+         * @param name Platform font name
+         * @param file File name
+         */
+        public FontEntry(String charset, String name, String file) {
+            this.charset = charset;
+            this.name = name;
+            this.file = file;
+        }
     }
 
     private static final byte[] INSECURE_PUBLIC_KEY = new byte[] {
@@ -309,16 +358,136 @@ public class PlatformHookWindows extends PlatformHookUnixoid {
             // Fallback for Windows OS earlier than Windows Vista, where the variable is not defined
             p = System.getenv("APPDATA");
         }
-        return new File(new File(p, "JOSM"), "cache");
+        return new File(new File(p, Main.pref.getJOSMDirectoryBaseName()), "cache");
     }
 
     @Override
     public File getDefaultPrefDirectory() {
-        return new File(System.getenv("APPDATA"), "JOSM");
+        return new File(System.getenv("APPDATA"), Main.pref.getJOSMDirectoryBaseName());
     }
 
     @Override
-    public Collection<String> getInstalledFonts() {
+    public File getDefaultUserDataDirectory() {
+        // Use preferences directory by default
+        return Main.pref.getPreferencesDirectory();
+    }
+
+    /**
+     * <p>Add more fallback fonts to the Java runtime, in order to get
+     * support for more scripts.</p>
+     *
+     * <p>The font configuration in Java doesn't include some Indic scripts,
+     * even though MS Windows ships with fonts that cover these unicode ranges.</p>
+     *
+     * <p>To fix this, the fontconfig.properties template is copied to the JOSM
+     * cache folder. Then, the additional entries are added to the font
+     * configuration. Finally the system property "sun.awt.fontconfig" is set
+     * to the customized fontconfig.properties file.</p>
+     *
+     * <p>This is a crude hack, but better than no font display at all for these languages.
+     * There is no guarantee, that the template file
+     * ($JAVA_HOME/lib/fontconfig.properties.src) matches the default
+     * configuration (which is in a binary format).
+     * Furthermore, the system property "sun.awt.fontconfig" is undocumented and
+     * may no longer work in future versions of Java.</p>
+     *
+     * <p>Related Java bug: <a href="https://bugs.openjdk.java.net/browse/JDK-8008572">JDK-8008572</a></p>
+     *
+     * @param templateFileName file name of the fontconfig.properties template file
+     */
+    protected void extendFontconfig(String templateFileName) {
+        String customFontconfigFile = Main.pref.get("fontconfig.properties", null);
+        if (customFontconfigFile != null) {
+            Utils.updateSystemProperty("sun.awt.fontconfig", customFontconfigFile);
+            return;
+        }
+        if (!Main.pref.getBoolean("font.extended-unicode", true))
+            return;
+
+        String javaLibPath = System.getProperty("java.home") + File.separator + "lib";
+        Path templateFile = FileSystems.getDefault().getPath(javaLibPath, templateFileName);
+        if (!Files.isReadable(templateFile)) {
+            Main.warn("extended font config - unable to find font config template file {0}", templateFile.toString());
+            return;
+        }
+        try (FileInputStream fis = new FileInputStream(templateFile.toFile())) {
+            Properties props = new Properties();
+            props.load(fis);
+            byte[] content = Files.readAllBytes(templateFile);
+            File cachePath = Main.pref.getCacheDirectory();
+            Path fontconfigFile = cachePath.toPath().resolve("fontconfig.properties");
+            OutputStream os = Files.newOutputStream(fontconfigFile);
+            os.write(content);
+            try (Writer w = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) {
+                Collection<FontEntry> extrasPref = Main.pref.getListOfStructs(
+                        "font.extended-unicode.extra-items", getAdditionalFonts(), FontEntry.class);
+                Collection<FontEntry> extras = new ArrayList<>();
+                w.append("\n\n# Added by JOSM to extend unicode coverage of Java font support:\n\n");
+                List<String> allCharSubsets = new ArrayList<>();
+                for (FontEntry entry: extrasPref) {
+                    Collection<String> fontsAvail = getInstalledFonts();
+                    if (fontsAvail != null && fontsAvail.contains(entry.file.toUpperCase(Locale.ENGLISH))) {
+                        if (!allCharSubsets.contains(entry.charset)) {
+                            allCharSubsets.add(entry.charset);
+                            extras.add(entry);
+                        } else {
+                            Main.trace("extended font config - already registered font for charset ''{0}'' - skipping ''{1}''",
+                                    entry.charset, entry.name);
+                        }
+                    } else {
+                        Main.trace("extended font config - Font ''{0}'' not found on system - skipping", entry.name);
+                    }
+                }
+                for (FontEntry entry: extras) {
+                    allCharSubsets.add(entry.charset);
+                    if ("".equals(entry.name)) {
+                        continue;
+                    }
+                    String key = "allfonts." + entry.charset;
+                    String value = entry.name;
+                    String prevValue = props.getProperty(key);
+                    if (prevValue != null && !prevValue.equals(value)) {
+                        Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value);
+                    }
+                    w.append(key + '=' + value + '\n');
+                }
+                w.append('\n');
+                for (FontEntry entry: extras) {
+                    if ("".equals(entry.name) || "".equals(entry.file)) {
+                        continue;
+                    }
+                    String key = "filename." + entry.name.replace(' ', '_');
+                    String value = entry.file;
+                    String prevValue = props.getProperty(key);
+                    if (prevValue != null && !prevValue.equals(value)) {
+                        Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value);
+                    }
+                    w.append(key + '=' + value + '\n');
+                }
+                w.append('\n');
+                String fallback = props.getProperty("sequence.fallback");
+                if (fallback != null) {
+                    w.append("sequence.fallback=" + fallback + ',' + Utils.join(",", allCharSubsets) + '\n');
+                } else {
+                    w.append("sequence.fallback=" + Utils.join(",", allCharSubsets) + '\n');
+                }
+            }
+            Utils.updateSystemProperty("sun.awt.fontconfig", fontconfigFile.toString());
+        } catch (IOException ex) {
+            Main.error(ex);
+        }
+    }
+
+    /**
+     * Get a list of fonts that are installed on the system.
+     *
+     * Must be done without triggering the Java Font initialization.
+     * (See {@link #extendFontconfig(java.lang.String)}, have to set system
+     * property first, which is then read by sun.awt.FontConfiguration upon initialization.)
+     *
+     * @return list of file names
+     */
+    protected Collection<String> getInstalledFonts() {
         // Cannot use GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames()
         // because we have to set the system property before Java initializes its fonts.
         // Use more low-level method to find the installed fonts.
@@ -340,8 +509,14 @@ public class PlatformHookWindows extends PlatformHookUnixoid {
         return fontsAvail;
     }
 
-    @Override
-    public Collection<FontEntry> getAdditionalFonts() {
+    /**
+     * Get default list of additional fonts to add to the configuration.
+     *
+     * Java will choose thee first font in the list that can render a certain character.
+     *
+     * @return list of FontEntry objects
+     */
+    protected Collection<FontEntry> getAdditionalFonts() {
         Collection<FontEntry> def = new ArrayList<>(33);
         def.add(new FontEntry("devanagari", "", "")); // just include in fallback list font already defined in template
 
diff --git a/src/org/openstreetmap/josm/tools/Shortcut.java b/src/org/openstreetmap/josm/tools/Shortcut.java
index 2448aec..79d3f29 100644
--- a/src/org/openstreetmap/josm/tools/Shortcut.java
+++ b/src/org/openstreetmap/josm/tools/Shortcut.java
@@ -6,11 +6,14 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
 import javax.swing.AbstractButton;
@@ -267,20 +270,50 @@ public final class Shortcut {
     ///////////////////////////////
 
     // here we store our shortcuts
-    private static Map<String, Shortcut> shortcuts = new LinkedHashMap<>();
+    private static ShortcutCollection shortcuts = new ShortcutCollection();
+
+    private static class ShortcutCollection extends CopyOnWriteArrayList<Shortcut> {
+        @Override
+        public boolean add(Shortcut shortcut) {
+            // expensive consistency check only in debug mode
+            if (Main.isDebugEnabled()
+                    && stream().map(Shortcut::getShortText).anyMatch(shortcut.getShortText()::equals)) {
+                Main.warn(new AssertionError(shortcut.getShortText() + " already added"));
+            }
+            return super.add(shortcut);
+        }
+
+        public void replace(Shortcut newShortcut) {
+            final Optional<Shortcut> existing = findShortcutByKeyOrShortText(-1, NONE, newShortcut.shortText);
+            if (existing.isPresent()) {
+                replaceAll(sc -> existing.get() == sc ? newShortcut : sc);
+            } else {
+                add(newShortcut);
+            }
+        }
+    }
 
     // and here our modifier groups
     private static Map<Integer, Integer> groups = new HashMap<>();
 
     // check if something collides with an existing shortcut
-    public static Shortcut findShortcut(int requestedKey, int modifier) {
-        if (modifier == getGroupModifier(NONE))
-            return null;
-        for (Shortcut sc : shortcuts.values()) {
-            if (sc.isSame(requestedKey, modifier))
-                return sc;
-        }
-        return null;
+
+    /**
+     * Returns the registered shortcut fot the key and modifier
+     * @param requestedKey the requested key
+     * @param modifier the modifier
+     * @return an {@link Optional} registered shortcut, never {@code null}
+     */
+    public static Optional<Shortcut> findShortcut(int requestedKey, int modifier) {
+        return findShortcutByKeyOrShortText(requestedKey, modifier, null);
+    }
+
+    private static Optional<Shortcut> findShortcutByKeyOrShortText(int requestedKey, int modifier, String shortText) {
+        final Predicate<Shortcut> sameKey = sc -> modifier != getGroupModifier(NONE) && sc.isSame(requestedKey, modifier);
+        final Predicate<Shortcut> sameShortText = sc -> sc.getShortText().equals(shortText);
+        return shortcuts.stream()
+                .filter(sameKey.or(sameShortText))
+                .findAny();
     }
 
     /**
@@ -288,13 +321,9 @@ public final class Shortcut {
      * @return a list of all shortcuts
      */
     public static List<Shortcut> listAll() {
-        List<Shortcut> l = new ArrayList<>();
-        for (Shortcut c : shortcuts.values()) {
-            if (!"core:none".equals(c.shortText)) {
-                l.add(c);
-            }
-        }
-        return l;
+        return shortcuts.stream()
+                .filter(c -> !"core:none".equals(c.shortText))
+                .collect(Collectors.toList());
     }
 
     /** None group: used with KeyEvent.CHAR_UNDEFINED if no shortcut is defined */
@@ -345,31 +374,11 @@ public final class Shortcut {
         // (1) System reserved shortcuts
         Main.platform.initSystemShortcuts();
         // (2) User defined shortcuts
-        List<Shortcut> newshortcuts = new LinkedList<>();
-        for (String s : Main.pref.getAllPrefixCollectionKeys("shortcut.entry.")) {
-            newshortcuts.add(new Shortcut(s));
-        }
-
-        for (Shortcut sc : newshortcuts) {
-            if (sc.isAssignedUser()
-            && findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()) == null) {
-                shortcuts.put(sc.getShortText(), sc);
-            }
-        }
-        // Shortcuts at their default values
-        for (Shortcut sc : newshortcuts) {
-            if (!sc.isAssignedUser() && sc.isAssignedDefault()
-            && findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()) == null) {
-                shortcuts.put(sc.getShortText(), sc);
-            }
-        }
-        // Shortcuts that were automatically moved
-        for (Shortcut sc : newshortcuts) {
-            if (!sc.isAssignedUser() && !sc.isAssignedDefault()
-            && findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()) == null) {
-                shortcuts.put(sc.getShortText(), sc);
-            }
-        }
+        Main.pref.getAllPrefixCollectionKeys("shortcut.entry.").stream()
+                .map(Shortcut::new)
+                .filter(sc -> !findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()).isPresent())
+                .sorted(Comparator.comparing(sc -> sc.isAssignedUser() ? 1 : sc.isAssignedDefault() ? 2 : 3))
+                .forEachOrdered(shortcuts::replace);
     }
 
     private static int getGroupModifier(int group) {
@@ -391,11 +400,9 @@ public final class Shortcut {
 
     // shutdown handling
     public static boolean savePrefs() {
-        boolean changed = false;
-        for (Shortcut sc : shortcuts.values()) {
-            changed = changed | sc.save();
-        }
-        return changed;
+        return shortcuts.stream()
+                .map(Shortcut::save)
+                .reduce(false, Boolean::logicalOr); // has changed
     }
 
     /**
@@ -410,17 +417,17 @@ public final class Shortcut {
      * @return the system shortcut
      */
     public static Shortcut registerSystemShortcut(String shortText, String longText, int key, int modifier) {
-        if (shortcuts.containsKey(shortText))
-            return shortcuts.get(shortText);
-        Shortcut potentialShortcut = findShortcut(key, modifier);
-        if (potentialShortcut != null) {
+        final Optional<Shortcut> existing = findShortcutByKeyOrShortText(key, modifier, shortText);
+        if (existing.isPresent() && shortText.equals(existing.get().getShortText())) {
+            return existing.get();
+        } else if (existing.isPresent()) {
             // this always is a logic error in the hook
-            Main.error("CONFLICT WITH SYSTEM KEY "+shortText+": "+potentialShortcut);
+            Main.error("CONFLICT WITH SYSTEM KEY " + shortText + ": " + existing.get());
             return null;
         }
-        potentialShortcut = new Shortcut(shortText, longText, key, RESERVED, key, modifier, true, false);
-        shortcuts.put(shortText, potentialShortcut);
-        return potentialShortcut;
+        final Shortcut shortcut = new Shortcut(shortText, longText, key, RESERVED, key, modifier, true, false);
+        shortcuts.add(shortcut);
+        return shortcut;
     }
 
     /**
@@ -446,19 +453,20 @@ public final class Shortcut {
     // and now the workhorse. same parameters as above, just one more
     private static Shortcut registerShortcut(String shortText, String longText, int requestedKey, int requestedGroup, Integer modifier) {
         doInit();
-        if (shortcuts.containsKey(shortText)) { // a re-register? maybe a sc already read from the preferences?
-            Shortcut sc = shortcuts.get(shortText);
+        Integer defaultModifier = findModifier(requestedGroup, modifier);
+        final Optional<Shortcut> existing = findShortcutByKeyOrShortText(requestedKey, defaultModifier, shortText);
+        if (existing.isPresent() && shortText.equals(existing.get().getShortText())) {
+            // a re-register? maybe a sc already read from the preferences?
+            final Shortcut sc = existing.get();
             sc.setLongText(longText); // or set by the platformHook, in this case the original longText doesn't match the real action
             sc.saveDefault();
             return sc;
-        }
-        Integer defaultModifier = findModifier(requestedGroup, modifier);
-        Shortcut conflict = findShortcut(requestedKey, defaultModifier);
-        if (conflict != null) {
+        } else if (existing.isPresent()) {
+            final Shortcut conflict = existing.get();
             if (Main.isPlatformOsx()) {
                 // Try to reassign Meta to Ctrl
                 int newmodifier = findNewOsxModifier(requestedGroup);
-                if (findShortcut(requestedKey, newmodifier) == null) {
+                if (!findShortcut(requestedKey, newmodifier).isPresent()) {
                     Main.info("Reassigning OSX shortcut '" + shortText + "' from Meta to Ctrl because of conflict with " + conflict);
                     return reassignShortcut(shortText, longText, requestedKey, conflict, requestedGroup, requestedKey, newmodifier);
                 }
@@ -466,7 +474,7 @@ public final class Shortcut {
             for (int m : mods) {
                 for (int k : keys) {
                     int newmodifier = getGroupModifier(m);
-                    if (findShortcut(k, newmodifier) == null) {
+                    if (!findShortcut(k, newmodifier).isPresent()) {
                         Main.info("Reassigning shortcut '" + shortText + "' from " + modifier + " to " + newmodifier +
                                 " because of conflict with " + conflict);
                         return reassignShortcut(shortText, longText, requestedKey, conflict, m, k, newmodifier);
@@ -476,7 +484,7 @@ public final class Shortcut {
         } else {
             Shortcut newsc = new Shortcut(shortText, longText, requestedKey, requestedGroup, requestedKey, defaultModifier, true, false);
             newsc.saveDefault();
-            shortcuts.put(shortText, newsc);
+            shortcuts.add(newsc);
             return newsc;
         }
 
@@ -499,7 +507,7 @@ public final class Shortcut {
         Main.info(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.",
             shortText, conflict.getShortText(), newsc.getKeyText()));
         newsc.saveDefault();
-        shortcuts.put(shortText, newsc);
+        shortcuts.add(newsc);
         return newsc;
     }
 
@@ -511,9 +519,7 @@ public final class Shortcut {
      * @return the platform specific key stroke for the  'Copy' command
      */
     public static KeyStroke getCopyKeyStroke() {
-        Shortcut sc = shortcuts.get("system:copy");
-        if (sc == null) return null;
-        return sc.getKeyStroke();
+        return getKeyStrokeForShortKey("system:copy");
     }
 
     /**
@@ -524,9 +530,7 @@ public final class Shortcut {
      * @return the platform specific key stroke for the 'Paste' command
      */
     public static KeyStroke getPasteKeyStroke() {
-        Shortcut sc = shortcuts.get("system:paste");
-        if (sc == null) return null;
-        return sc.getKeyStroke();
+        return getKeyStrokeForShortKey("system:paste");
     }
 
     /**
@@ -537,8 +541,14 @@ public final class Shortcut {
      * @return the platform specific key stroke for the 'Cut' command
      */
     public static KeyStroke getCutKeyStroke() {
-        Shortcut sc = shortcuts.get("system:cut");
-        if (sc == null) return null;
-        return sc.getKeyStroke();
+        return getKeyStrokeForShortKey("system:cut");
+    }
+
+    private static KeyStroke getKeyStrokeForShortKey(String shortKey) {
+        return shortcuts.stream()
+                .filter(sc -> shortKey.equals(sc.getShortText()))
+                .findAny()
+                .map(Shortcut::getKeyStroke)
+                .orElse(null);
     }
 }
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index bb77570..b0b5923 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -7,8 +7,6 @@ import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.Color;
 import java.awt.Font;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.Transferable;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.io.BufferedReader;
@@ -53,7 +51,6 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Stream;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -68,7 +65,6 @@ import javax.xml.parsers.SAXParserFactory;
 
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -83,9 +79,9 @@ public final class Utils {
     public static final Pattern WHITE_SPACES_PATTERN = Pattern.compile("\\s+");
 
     private static final int MILLIS_OF_SECOND = 1000;
-    private static final int MILLIS_OF_MINUTE = 60000;
-    private static final int MILLIS_OF_HOUR = 3600000;
-    private static final int MILLIS_OF_DAY = 86400000;
+    private static final int MILLIS_OF_MINUTE = 60_000;
+    private static final int MILLIS_OF_HOUR = 3_600_000;
+    private static final int MILLIS_OF_DAY = 86_400_000;
 
     /**
      * A list of all characters allowed in URLs
@@ -101,39 +97,6 @@ public final class Utils {
     }
 
     /**
-     * Tests whether {@code predicate} applies to at least one element from {@code collection}.
-     * <p>
-     * @param <T> type of items
-     * @param collection the collection
-     * @param predicate the predicate
-     * @return {@code true} if {@code predicate} applies to at least one element from {@code collection}
-     * @deprecated use {@link Stream#anyMatch(Predicate)} instead.
-     */
-    @Deprecated
-    public static <T> boolean exists(Iterable<? extends T> collection, Predicate<? super T> predicate) {
-        for (T item : collection) {
-            if (predicate.test(item)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Tests whether {@code predicate} applies to all elements from {@code collection}.
-     * <p>
-     * @param <T> type of items
-     * @param collection the collection
-     * @param predicate the predicate
-     * @return {@code true} if {@code predicate} applies to all elements from {@code collection}
-     * @deprecated use {@link Stream#allMatch(Predicate)} instead.
-     */
-    @Deprecated
-    public static <T> boolean forAll(Iterable<? extends T> collection, Predicate<? super T> predicate) {
-        return !exists(collection, predicate.negate());
-    }
-
-    /**
      * Checks if an item that is an instance of clazz exists in the collection
      * @param <T> The collection type.
      * @param collection The collection
@@ -582,39 +545,6 @@ public final class Utils {
     }
 
     /**
-     * Copies the string {@code s} to system clipboard.
-     * @param s string to be copied to clipboard.
-     * @return true if succeeded, false otherwise.
-     * @deprecated Use {@link ClipboardUtils#copyString(String)}. To be removed end of 2016.
-     */
-    @Deprecated
-    public static boolean copyToClipboard(String s) {
-        return ClipboardUtils.copyString(s);
-    }
-
-    /**
-     * Extracts clipboard content as {@code Transferable} object.
-     * @param clipboard clipboard from which contents are retrieved
-     * @return clipboard contents if available, {@code null} otherwise.
-     * @since 8429
-     * @deprecated Use {@link ClipboardUtils#getClipboardContent(Clipboard)} instead. To be removed end of 2016.
-     */
-    @Deprecated
-    public static Transferable getTransferableContent(Clipboard clipboard) {
-        return ClipboardUtils.getClipboardContent(clipboard);
-    }
-
-    /**
-     * Extracts clipboard content as string.
-     * @return string clipboard contents if available, {@code null} otherwise.
-     * @deprecated Use {@link ClipboardUtils#getClipboardStringContent()}. To be removed end of 2016
-     */
-    @Deprecated
-    public static String getClipboardContent() {
-        return ClipboardUtils.getClipboardStringContent();
-    }
-
-    /**
      * Calculate MD5 hash of a string and output in hexadecimal format.
      * @param data arbitrary String
      * @return MD5 hash of data, string of length 32 with characters in range [0-9a-f]
@@ -1571,4 +1501,22 @@ public final class Utils {
             return val;
         }
     }
+
+    /**
+     * Clamp a integer value to the given range
+     * @param val The value
+     * @param min minimum value
+     * @param max maximum value
+     * @return the value
+     * @since 11055
+     */
+    public static int clamp(int val, int min, int max) {
+        if (val < min) {
+            return min;
+        } else if (val > max) {
+            return max;
+        } else {
+            return val;
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java b/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java
index 31d2fa6..0ae2e7a 100644
--- a/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java
+++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java
@@ -99,7 +99,7 @@ public class BugReportDialog extends JDialog {
         JMultilineLabel messageLabel = new JMultilineLabel(message);
         messageLabel.setMaxWidth(MAX_MESSAGE_SIZE);
         panel.add(messageLabel, GBC.eol().fill());
-        content.add(panel, GBC.eop().fill(GBC.HORIZONTAL).insets(20));
+        content.add(panel, GBC.eop().fill(GBC.HORIZONTAL).insets(20, 10, 10, 10));
     }
 
     private void addDebugTextSection() {
@@ -107,10 +107,10 @@ public class BugReportDialog extends JDialog {
         addBorder(panel, tr("Debug information"));
         panel.add(textPanel, GBC.eop().fill());
 
-        panel.add(new JLabel(tr("Manually report at:")), GBC.std());
+        panel.add(new JLabel(tr("Manually report at:")+' '), GBC.std());
         panel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket"), GBC.std().fill(GBC.HORIZONTAL));
         JButton copy = new JButton("Copy to clipboard");
-        copy.addActionListener(e -> textPanel.copyToClippboard());
+        copy.addActionListener(e -> textPanel.copyToClipboard());
         panel.add(copy, GBC.eol().anchor(GBC.EAST));
         content.add(panel, GBC.eop().fill());
     }
@@ -134,20 +134,22 @@ public class BugReportDialog extends JDialog {
         helpText.setMaxWidth(MAX_MESSAGE_SIZE);
         panel.add(helpText, GBC.eop().fill(GridBagConstraints.HORIZONTAL));
 
+        Component settings = GBC.glue(0, 0);
         if (ExpertToggleAction.isExpert()) {
             // The default settings should be fine in most situations.
-            panel.add(new BugReportSettingsPanel(report), GBC.eop().fill(GBC.HORIZONTAL));
+            settings = new BugReportSettingsPanel(report);
         }
+        panel.add(settings);
 
         JButton sendBugReportButton = new JButton(tr("Report Bug"), ImageProvider.get("bug"));
         sendBugReportButton.addActionListener(e -> sendBug());
-        panel.add(sendBugReportButton, GBC.eop().anchor(GBC.EAST));
+        panel.add(sendBugReportButton, GBC.eol().insets(0, 0, 0, 0).anchor(GBC.SOUTHEAST));
         content.add(panel, GBC.eop().fill(GBC.HORIZONTAL));
     }
 
     private static void addBorder(JPanel panel, String title) {
         panel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(title), BorderFactory
-                .createEmptyBorder(10, 10, 10, 10)));
+                .createEmptyBorder(5, 5, 5, 5)));
     }
 
     private void addIgnoreButton() {
@@ -161,7 +163,7 @@ public class BugReportDialog extends JDialog {
         JButton ignore = new JButton(tr("Ignore this error."));
         ignore.addActionListener(e -> closeDialog());
         panel.add(ignore, GBC.std(1, 0).span(1, 2).anchor(GBC.CENTER));
-        content.add(panel, GBC.eol().fill(GBC.HORIZONTAL).insets(20));
+        content.add(panel, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 10, 10));
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java b/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java
index 7ca45db..9ce2b62 100644
--- a/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java
+++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java
@@ -9,6 +9,7 @@ import java.util.function.BiFunction;
 import java.util.function.Predicate;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
  * This class handles the display of the bug report dialog.
@@ -52,6 +53,7 @@ public class BugReportQueue {
      * @param report The error to display
      */
     public synchronized void submit(ReportedException report) {
+        Logging.logWithStackTrace(Logging.LEVEL_ERROR, "Handled by bug report queue", report.getCause());
         if (suppressAllMessages || suppressFor.stream().anyMatch(report::isSame)) {
             Main.info("User requested to skip error " + report);
         } else if (reportsToDisplay.size() > 100 || reportsToDisplay.stream().filter(report::isSame).count() >= 10) {
@@ -59,22 +61,27 @@ public class BugReportQueue {
         } else {
             reportsToDisplay.add(report);
             if (displayThread == null) {
-                displayThread = new Thread(this::displayAll, "bug-report-display");
+                displayThread = new Thread(new BugReportDisplayRunnable(), "bug-report-display");
                 displayThread.start();
             }
             notifyAll();
         }
     }
 
-    private void displayAll() {
-        try {
-            while (true) {
-                ReportedException e = getNext();
-                SuppressionMode suppress = displayFor(e);
-                handleDialogResult(e, suppress);
+    private class BugReportDisplayRunnable implements Runnable {
+
+        private volatile boolean running = true;
+
+        @Override
+        public void run() {
+            try {
+                while (running) {
+                    ReportedException e = getNext();
+                    handleDialogResult(e, displayFor(e));
+                }
+            } catch (InterruptedException e) {
+                displayFor(BugReport.intercept(e));
             }
-        } catch (InterruptedException e) {
-            displayFor(BugReport.intercept(e));
         }
     }
 
diff --git a/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java b/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java
index 05ee0e1..3d6fb3c 100644
--- a/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java
+++ b/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java
@@ -28,7 +28,7 @@ public class DebugTextDisplay extends JScrollPane {
         textArea.setCaretPosition(0);
         textArea.setEditable(false);
         setViewportView(textArea);
-        setPreferredSize(new Dimension(600, 300));
+        setPreferredSize(new Dimension(600, 270));
     }
 
     /**
@@ -64,8 +64,9 @@ public class DebugTextDisplay extends JScrollPane {
     /**
      * Copies the debug text to the clipboard. This includes the code tags for trac.
      * @return <code>true</code> if copy was successful
+     * @since 11102 (typo)
      */
-    public boolean copyToClippboard() {
+    public boolean copyToClipboard() {
         return ClipboardUtils.copyString(String.format(CODE_PATTERN, text));
     }
 
diff --git a/src/org/openstreetmap/josm/tools/bugreport/JosmUpdatePanel.java b/src/org/openstreetmap/josm/tools/bugreport/JosmUpdatePanel.java
index 48092ee..c08ac91 100644
--- a/src/org/openstreetmap/josm/tools/bugreport/JosmUpdatePanel.java
+++ b/src/org/openstreetmap/josm/tools/bugreport/JosmUpdatePanel.java
@@ -34,9 +34,9 @@ public class JosmUpdatePanel extends JPanel {
         super(new GridBagLayout());
         josmVersion = Version.getInstance().getVersion();
 
-        add(new JMultilineLabel(tr("Your current version of JOSM is {0}", josmVersion)), GBC.eop().fill(GBC.HORIZONTAL));
+        add(new JMultilineLabel(tr("Your current version of JOSM is {0}", josmVersion)), GBC.eol().fill(GBC.HORIZONTAL));
         testedVersionField = new JMultilineLabel(tr("JOSM is searching for updates..."));
-        add(testedVersionField, GBC.eop().fill(GBC.HORIZONTAL));
+        add(testedVersionField, GBC.eol().fill(GBC.HORIZONTAL));
 
         checkCurrentVersion();
     }
diff --git a/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java b/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java
index 110f17e..953f4d8 100644
--- a/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java
+++ b/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java
@@ -45,7 +45,6 @@ public class ReportedException extends RuntimeException {
     private final transient Map<Thread, StackTraceElement[]> allStackTraces;
     private final LinkedList<Section> sections = new LinkedList<>();
     private final transient Thread caughtOnThread;
-    private final Throwable exception;
     private String methodWarningFrom;
 
     ReportedException(Throwable exception) {
@@ -54,7 +53,6 @@ public class ReportedException extends RuntimeException {
 
     ReportedException(Throwable exception, Thread caughtOnThread) {
         super(exception);
-        this.exception = exception;
 
         allStackTraces = Thread.getAllStackTraces();
         this.caughtOnThread = caughtOnThread;
@@ -156,7 +154,7 @@ public class ReportedException extends RuntimeException {
             return false;
         }
 
-        return hasSameStackTrace(new CauseTraceIterator(), e.exception);
+        return hasSameStackTrace(new CauseTraceIterator(), e.getCause());
     }
 
     private static boolean hasSameStackTrace(CauseTraceIterator causeTraceIterator, Throwable e2) {
@@ -246,7 +244,7 @@ public class ReportedException extends RuntimeException {
 
     @Override
     public String toString() {
-        return "ReportedException [thread=" + caughtOnThread + ", exception=" + exception
+        return "ReportedException [thread=" + caughtOnThread + ", exception=" + getCause()
                 + ", methodWarningFrom=" + methodWarningFrom + "]";
     }
 
@@ -275,7 +273,7 @@ public class ReportedException extends RuntimeException {
      * @since 10585
      */
     private final class CauseTraceIterator implements Iterator<Throwable> {
-        private Throwable current = exception;
+        private Throwable current = getCause();
         private final Set<Throwable> dejaVu = Collections.newSetFromMap(new IdentityHashMap<Throwable, Boolean>());
 
         @Override
diff --git a/src/org/openstreetmap/josm/tools/date/DateUtils.java b/src/org/openstreetmap/josm/tools/date/DateUtils.java
index c8a3245..68118a7 100644
--- a/src/org/openstreetmap/josm/tools/date/DateUtils.java
+++ b/src/org/openstreetmap/josm/tools/date/DateUtils.java
@@ -4,15 +4,17 @@ package org.openstreetmap.josm.tools.date;
 import java.text.DateFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
@@ -40,23 +42,9 @@ public final class DateUtils {
      */
     public static final BooleanProperty PROP_ISO_DATES = new BooleanProperty("iso.dates", false);
 
-    /**
-     * A shared instance used for conversion between individual date fields
-     * and long millis time. It is guarded against conflict by the class lock.
-     * The shared instance is used because the construction, together
-     * with the timezone lookup, is very expensive.
-     */
-    private static final GregorianCalendar calendar = new GregorianCalendar(UTC);
-    /**
-     * A shared instance to convert local times. The time zone should be set before every conversion.
-     */
-    private static final GregorianCalendar calendarLocale = new GregorianCalendar(TimeZone.getDefault());
     private static final DatatypeFactory XML_DATE;
 
     static {
-        calendar.setTimeInMillis(0);
-        calendarLocale.setTimeInMillis(0);
-
         DatatypeFactory fact = null;
         try {
             fact = DatatypeFactory.newInstance();
@@ -96,49 +84,45 @@ public final class DateUtils {
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx-xx") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx+xx:00") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx-xx:00")) {
-            final Calendar c; // consider EXIF date in default timezone
-            if (checkLayout(str, "xxxx:xx:xx xx:xx:xx")) {
-                c = getLocalCalendar();
-            } else {
-                c = calendar;
-            }
-            c.set(
+            final ZonedDateTime local = ZonedDateTime.of(
                 parsePart4(str, 0),
-                parsePart2(str, 5)-1,
+                parsePart2(str, 5),
                 parsePart2(str, 8),
                 parsePart2(str, 11),
                 parsePart2(str, 14),
-                parsePart2(str, 17));
-            c.set(Calendar.MILLISECOND, 0);
-
+                parsePart2(str, 17),
+                0,
+                // consider EXIF date in default timezone
+                checkLayout(str, "xxxx:xx:xx xx:xx:xx") ? ZoneId.systemDefault() : ZoneOffset.UTC
+            );
             if (str.length() == 22 || str.length() == 25) {
-                int plusHr = parsePart2(str, 20);
-                int mul = str.charAt(19) == '+' ? -3600000 : 3600000;
-                return c.getTimeInMillis()+plusHr*mul;
+                final int plusHr = parsePart2(str, 20);
+                final long mul = str.charAt(19) == '+' ? -1 : 1;
+                return local.plusHours(plusHr * mul).toInstant().toEpochMilli();
             }
-
-            return c.getTimeInMillis();
+            return local.toInstant().toEpochMilli();
         } else if (checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxxZ") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx") ||
                 checkLayout(str, "xxxx:xx:xx xx:xx:xx.xxx") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx+xx:00") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx-xx:00")) {
-            // consider EXIF date in default timezone
-            final Calendar c = checkLayout(str, "xxxx:xx:xx xx:xx:xx.xxx") ? getLocalCalendar() : calendar;
-            c.set(
+            final ZonedDateTime local = ZonedDateTime.of(
                 parsePart4(str, 0),
-                parsePart2(str, 5)-1,
+                parsePart2(str, 5),
                 parsePart2(str, 8),
                 parsePart2(str, 11),
                 parsePart2(str, 14),
-                parsePart2(str, 17));
-            c.set(Calendar.MILLISECOND, 0);
-            long millis = parsePart3(str, 20);
+                parsePart2(str, 17),
+                parsePart3(str, 20) * 1_000_000,
+                // consider EXIF date in default timezone
+                checkLayout(str, "xxxx:xx:xx xx:xx:xx.xxx") ? ZoneId.systemDefault() : ZoneOffset.UTC
+            );
             if (str.length() == 29) {
-                millis += parsePart2(str, 24) * (str.charAt(23) == '+' ? -3600000 : 3600000);
+                final int plusHr = parsePart2(str, 24);
+                final long mul = str.charAt(23) == '+' ? -1 : 1;
+                return local.plusHours(plusHr * mul).toInstant().toEpochMilli();
             }
-
-            return c.getTimeInMillis() + millis;
+            return local.toInstant().toEpochMilli();
         } else {
             // example date format "18-AUG-08 13:33:03"
             SimpleDateFormat f = new SimpleDateFormat("dd-MMM-yy HH:mm:ss");
@@ -154,28 +138,14 @@ public final class DateUtils {
         }
     }
 
-    private static Calendar getLocalCalendar() {
-        final Calendar c = calendarLocale;
-        c.setTimeZone(TimeZone.getDefault());
-        return c;
-    }
-
-    private static String toXmlFormat(GregorianCalendar cal) {
-        XMLGregorianCalendar xgc = XML_DATE.newXMLGregorianCalendar(cal);
-        if (cal.get(Calendar.MILLISECOND) == 0) {
-            xgc.setFractionalSecond(null);
-        }
-        return xgc.toXMLFormat();
-    }
-
     /**
      * Formats a date to the XML UTC format regardless of current locale.
      * @param timestamp number of seconds since the epoch
      * @return The formatted date
      */
     public static synchronized String fromTimestamp(int timestamp) {
-        calendar.setTimeInMillis(timestamp * 1000L);
-        return toXmlFormat(calendar);
+        final ZonedDateTime temporal = Instant.ofEpochMilli(timestamp * 1000L).atZone(ZoneOffset.UTC);
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(temporal);
     }
 
     /**
@@ -184,8 +154,8 @@ public final class DateUtils {
      * @return The formatted date
      */
     public static synchronized String fromDate(Date date) {
-        calendar.setTime(date);
-        return toXmlFormat(calendar);
+        final ZonedDateTime temporal = date.toInstant().atZone(ZoneOffset.UTC);
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(temporal);
     }
 
     private static boolean checkLayout(String text, String pattern) {
diff --git a/src/org/openstreetmap/josm/tools/template_engine/Condition.java b/src/org/openstreetmap/josm/tools/template_engine/Condition.java
index e57b633..3db978a 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/Condition.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/Condition.java
@@ -40,15 +40,17 @@ public class Condition implements TemplateEntry {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("?{");
+        sb.append("?{ ");
         for (TemplateEntry entry: entries) {
             if (entry instanceof SearchExpressionCondition) {
                 sb.append(entry);
             } else {
                 sb.append('\'').append(entry).append('\'');
             }
-            sb.append('|');
+            sb.append(" | ");
         }
+        sb.setLength(sb.length() - 3);
+        sb.append(" }");
         return sb.toString();
     }
 }
diff --git a/src/org/openstreetmap/josm/tools/template_engine/Variable.java b/src/org/openstreetmap/josm/tools/template_engine/Variable.java
index 68c2d54..e820f6c 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/Variable.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/Variable.java
@@ -55,7 +55,7 @@ public class Variable implements TemplateEntry {
 
     @Override
     public String toString() {
-        return '{' + variableName + '}';
+        return '{' + (special ? SPECIAL_VARIABLE_PREFIX : "") + variableName + '}';
     }
 
     public boolean isSpecial() {
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index 5b21bcd..884f599 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -744,15 +744,18 @@ node[highway=rest_area] {
     icon-image: "presets/vehicle/rest_area.svg";
     set icon_z17;
 }
+node[ford=stepping_stones],
 node[ford?] {
     icon-image: "presets/vehicle/ford.svg";
     set icon_z17;
 }
+way[ford=stepping_stones]::core_ford,
 way[ford?]::core_ford {
     z-index: 1;
     width: 2;
     color: water#0000ff;
     dashes: 9,9;
+    dashes-offset: 9;
 }
 area[highway=platform]:closed {
     fill-color: highway_platform#c0c0c0;
@@ -3543,6 +3546,10 @@ node[aeroway=taxiway] {
     icon-image: "presets/misc/deprecated.svg";
     set icon_z17;
 }
+node[aeroway=holding_position] {
+    icon-image: "presets/transport/airport/holding_position.svg";
+    set icon_z17;
+}
 node[aeroway=hangar] {
     icon-image: "presets/transport/airport/hangar.svg";
     set icon_z17;
@@ -3699,8 +3706,6 @@ node[public_transport=station] {
 
 area[sport="9pin"],
 area[sport="10pin"],
-area[sport=athletics],
-area[sport=running],
 area[sport=soccer],
 area[sport=australian_football],
 area[sport=american_football],
@@ -3718,14 +3723,6 @@ node[sport="10pin"] {
     icon-image: "presets/sport/10pin.svg";
     set icon_z17;
 }
-node[sport=athletics] {
-    icon-image: "presets/sport/athletics.svg";
-    set icon_z17;
-}
-node[sport=running] {
-    icon-image: "presets/sport/running.svg";
-    set icon_z17;
-}
 node[sport=soccer],
 node[sport=gaelic_games] {
     icon-image: "presets/sport/soccer.svg";
@@ -3846,7 +3843,27 @@ node[sport=motor] {
     icon-image: "presets/sport/motor.svg";
     set icon_z17;
 }
-area[sport=multi],
+area[sport=athletics] {
+    fill-color: sport_athletics#cfebd7;
+}
+node[sport=athletics] {
+    icon-image: "presets/sport/athletics.svg";
+    set icon_z17;
+}
+area[sport=running] {
+    fill-color: sport_running#cfebd8;
+}
+node[sport=running] {
+    icon-image: "presets/sport/running.svg";
+    set icon_z17;
+}
+area[sport=multi] {
+    fill-color: sport_multi#cfebd9;
+}
+node[sport=multi] {
+    icon-image: "presets/sport/multi.svg";
+    set icon_z17;
+}
 area[sport=pelota],
 area[sport=racquet],
 area[sport=ice_skating],
@@ -3854,10 +3871,6 @@ area[sport=roller_skating],
 area[sport=skateboard] {
     fill-color: sport#bde3cb;
 }
-node[sport=multi] {
-    icon-image: "presets/sport/multi.svg";
-    set icon_z17;
-}
 node[sport=pelota] {
     icon-image: "presets/sport/pelota.svg";
     set icon_z17;
@@ -4042,7 +4055,10 @@ way[natural=valley] {
     color: natural#002f00;
 }
 area[natural=scree] {
-    fill-color: natural#002f00;
+    fill-color: scree#c3c3c3;
+}
+area[natural=shingle] {
+    fill-color: shingle#c3c3c3;
 }
 area[natural=scrub] {
     fill-color: scrub#007000;
@@ -4141,6 +4157,7 @@ node[natural=tree][leaf_type=broadleaved] {
 }
 node[natural=glacier],
 node[natural=scree],
+node[natural=shingle],
 node[natural=scrub],
 node[natural=fell],
 node[natural=heath],
diff --git a/test/data/invalid_api/0.6/capabilities b/test/data/invalid_api/0.6/capabilities
new file mode 100644
index 0000000..4cd7560
--- /dev/null
+++ b/test/data/invalid_api/0.6/capabilities
@@ -0,0 +1,2 @@
+This is a dummy file used to test malformed API capabilities.
+It must be named capabilities in a directory named 0.6
diff --git a/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java b/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java
new file mode 100644
index 0000000..937a373
--- /dev/null
+++ b/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java
@@ -0,0 +1,47 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Tests the {@link GettingStarted} class.
+ */
+public class GettingStartedTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void init() {
+        JOSMFixture.createFunctionalTestFixture().init();
+    }
+
+    /**
+     * Tests that image links are replaced.
+     *
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testImageReplacement() throws IOException {
+        final String motd = new GettingStarted.MotdContent().updateIfRequiredString();
+        // assuming that the MOTD contains one image included, fixImageLinks changes the HTML string
+        assertFalse(GettingStarted.fixImageLinks(motd).equals(motd));
+    }
+
+    /**
+     * Tests that image links are replaced.
+     */
+    @Test
+    public void testImageReplacementStatic() {
+        final String html = "the download button <img src=\"/browser/trunk/images/download.png?format=raw\" " +
+                "alt=\"source:trunk/images/download.png\" title=\"source:trunk/images/download.png\" />.";
+        assertFalse(GettingStarted.fixImageLinks(html).equals(html));
+
+    }
+}
diff --git a/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java b/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java
index 892fd8e..2ec4693 100644
--- a/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java
+++ b/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java
@@ -8,33 +8,26 @@ import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.InputStream;
+import java.util.IdentityHashMap;
 
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.tools.Pair;
 
 /**
  * Test {@link StyleCache}.
- *
- * Verifies, that the intern pool is not growing when repeatedly rendering the
- * same set of primitives (and clearing the calculated styles each time).
- *
- * If it grows, this is an indication that the {@code equals} and {@code hashCode}
- * implementation is broken and two identical objects are not recognized as equal
- * or produce different hash codes.
- *
- * The opposite problem (different objects are mistaken as equal) has more visible
- * consequences for the user (wrong rendering on the map) and is not recognized by
- * this test.
  */
 public class StyleCacheTest {
 
@@ -45,6 +38,7 @@ public class StyleCacheTest {
     private static BufferedImage img;
     private static NavigatableComponent nc;
     private static DataSet dsCity;
+    private static DataSet dsCity2;
 
     @BeforeClass
     public static void load() throws Exception {
@@ -63,10 +57,27 @@ public class StyleCacheTest {
         ) {
             dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE);
         }
+        try (
+            InputStream fisC = Compression.getUncompressedFileInputStream(new File("data_nodist/neubrandenburg.osm.bz2"));
+        ) {
+            dsCity2 = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE);
+        }
     }
 
+    /**
+     * Verifies, that the intern pool is not growing when repeatedly rendering the
+     * same set of primitives (and clearing the calculated styles each time).
+     *
+     * If it grows, this is an indication that the {@code equals} and {@code hashCode}
+     * implementation is broken and two identical objects are not recognized as equal
+     * or produce different hash codes.
+     *
+     * The opposite problem (different objects are mistaken as equal) has more visible
+     * consequences for the user (wrong rendering on the map) and is not recognized by
+     * this test.
+     */
     @Test
-    public void testStyleCacheInternPool() throws Exception {
+    public void testStyleCacheInternPool() {
         Bounds bounds = new Bounds(53.56, 13.25, 53.57, 13.26);
         Rendering visitor = new StyledMapRenderer(g, nc, false);
         nc.zoomTo(bounds);
@@ -82,4 +93,44 @@ public class StyleCacheTest {
             }
         }
     }
+
+    /**
+     * Verifies, that the number of {@code StyleElementList} instances stored
+     * for all the rendered primitives is actually low (as intended).
+     *
+     * Two primitives with the same style should share one {@code StyleElementList}
+     * instance for the cached style elements. This is verified by counting all
+     * the instances using {@code A == B} identity.
+     */
+    @Test
+    public void testStyleCacheInternPool2() {
+        Bounds bounds = new Bounds(53.56, 13.25, 53.57, 13.26);
+        Rendering visitor = new StyledMapRenderer(g, nc, false);
+        nc.zoomTo(bounds);
+        visitor.render(dsCity2, true, bounds);
+
+        IdentityHashMap<StyleElementList, Integer> counter = new IdentityHashMap<>();
+        int noPrimitives = 0;
+        for (OsmPrimitive osm : dsCity2.allPrimitives()) {
+            // primitives, that have been rendered, should have the cache populated
+            if (osm.mappaintStyle != null) {
+                noPrimitives++;
+                Pair<StyleElementList, Range> p = osm.mappaintStyle.getWithRange(nc.getDist100Pixel(), false);
+                StyleElementList sel = p.a;
+                Assert.assertNotNull(sel);
+                Integer k = counter.get(sel);
+                if (k == null) {
+                    k = 0;
+                }
+                counter.put(sel, k + 1);
+            }
+        }
+        int EXPECTED_NO_PRIMITIVES = 4298; // needs to be updated if data file or bbox changes
+        Assert.assertEquals(
+                "The number of rendered primitives should be " + EXPECTED_NO_PRIMITIVES,
+                EXPECTED_NO_PRIMITIVES, noPrimitives);
+        Assert.assertTrue(
+                "Too many StyleElementList instances, they should be shared using the StyleCache",
+                counter.size() < 100);
+    }
 }
diff --git a/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java b/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
index 94b971b..8b874eb 100644
--- a/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
+++ b/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
@@ -41,6 +41,7 @@ import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.io.UploadStrategy;
 import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
  * Reads primitives referring to a particular primitive (ways including a node, relations referring to a relation)
@@ -164,7 +165,7 @@ public class OsmServerBackreferenceReaderTest {
         //
         Main.pref.put("osm-server.atomic-upload", false);
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        Main.logLevel = 4;
+        Logging.setLogLevel(Logging.LEVEL_DEBUG);
 
         File dataSetCacheOutputFile = new File(System.getProperty("java.io.tmpdir"),
                 MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
diff --git a/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java b/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
index 8a7c19f..20e0f22 100644
--- a/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
+++ b/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
@@ -35,7 +35,7 @@ public class HttpClientTest {
 
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
+    public JOSMTestRules test = new JOSMTestRules().preferences().timeout(15000);
 
     private ProgressMonitor progress;
 
diff --git a/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java b/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
index 18d73e9..2c01dc4 100644
--- a/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
+++ b/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
@@ -65,7 +66,7 @@ public class KeyValuePerformanceTest {
 
         for (int i = 0; i < STRING_INTERN_TESTS; i++) {
             // warm up
-            assertTrue(str1.equals(str1B));
+            assertEquals(str1, str1B);
         }
 
         PerformanceTestTimer timer = PerformanceTestUtils.startTimer("Assertion overhead.");
@@ -76,7 +77,7 @@ public class KeyValuePerformanceTest {
 
         timer = PerformanceTestUtils.startTimer("str1.equals(str2) succeeds (without intern)");
         for (int i = 0; i < STRING_INTERN_TESTS; i++) {
-            assertTrue(str1.equals(str1B));
+            assertEquals(str1, str1B);
         }
         timer.done();
 
diff --git a/test/unit/org/openstreetmap/josm/TestUtils.java b/test/unit/org/openstreetmap/josm/TestUtils.java
index 9786af5..31cbb85 100644
--- a/test/unit/org/openstreetmap/josm/TestUtils.java
+++ b/test/unit/org/openstreetmap/josm/TestUtils.java
@@ -8,10 +8,14 @@ import java.awt.Graphics2D;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Comparator;
 
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -160,6 +164,19 @@ public final class TestUtils {
     }
 
     /**
+     * Returns a private field value.
+     * @param obj object
+     * @param fieldName private field name
+     * @return private field value
+     * @throws ReflectiveOperationException if a reflection operation error occurs
+     */
+    public static Object getPrivateField(Object obj, String fieldName) throws ReflectiveOperationException {
+        Field f = obj.getClass().getDeclaredField(fieldName);
+        f.setAccessible(true);
+        return f.get(obj);
+    }
+
+    /**
      * Returns an instance of {@link AbstractProgressMonitor} which keeps track of the monitor state,
      * but does not show the progress.
      * @return a progress monitor
@@ -244,4 +261,23 @@ public final class TestUtils {
         }
         return relation;
     }
+
+    /**
+     * Creates a new empty command.
+     * @return a new empty command
+     */
+    public static Command newCommand() {
+        return new Command() {
+            @Override
+            public String getDescriptionText() {
+                return "";
+            }
+
+            @Override
+            public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
+                    Collection<OsmPrimitive> added) {
+                // Do nothing
+            }
+        };
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java b/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
index 57d11c3..8381f68 100644
--- a/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
@@ -2,7 +2,6 @@
 package org.openstreetmap.josm.actions;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
@@ -35,11 +34,11 @@ public final class AddImageryLayerActionTest {
      */
     @Test
     public void testEnabledState() {
-        assertFalse(new AddImageryLayerAction(new ImageryInfo()).isEnabled());
+        assertTrue(new AddImageryLayerAction(new ImageryInfo()).isEnabled());
         assertTrue(new AddImageryLayerAction(new ImageryInfo("foo_tms", "http://bar", "tms", null, null)).isEnabled());
         assertTrue(new AddImageryLayerAction(new ImageryInfo("foo_bing", "http://bar", "bing", null, null)).isEnabled());
         assertTrue(new AddImageryLayerAction(new ImageryInfo("foo_scanex", "http://bar", "scanex", null, null)).isEnabled());
-        assertFalse(new AddImageryLayerAction(new ImageryInfo("foo_wms_endpoint", "http://bar", "wms_endpoint", null, null)).isEnabled());
+        assertTrue(new AddImageryLayerAction(new ImageryInfo("foo_wms_endpoint", "http://bar", "wms_endpoint", null, null)).isEnabled());
     }
 
     /**
@@ -70,7 +69,11 @@ public final class AddImageryLayerActionTest {
     @Test
     public void testActionPerformedDisabled() {
         assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
-        new AddImageryLayerAction(new ImageryInfo()).actionPerformed(null);
+        try {
+            new AddImageryLayerAction(new ImageryInfo()).actionPerformed(null);
+        } catch (IllegalArgumentException expected) {
+            assertEquals("Parameter 'info.url' must not be null", expected.getMessage());
+        }
         assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy b/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy
deleted file mode 100644
index f82ec27..0000000
--- a/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.openstreetmap.josm.actions
-
-import org.junit.BeforeClass
-import org.junit.Test
-import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.TestUtils
-import org.openstreetmap.josm.actions.search.SearchAction
-import org.openstreetmap.josm.actions.search.SearchCompiler
-import org.openstreetmap.josm.data.osm.Relation
-import org.openstreetmap.josm.data.osm.Way
-import org.openstreetmap.josm.io.OsmReader
-import org.openstreetmap.josm.tools.SubclassFilteredCollection
-
-public class CreateMultipolygonActionTest {
-
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
-
-    static def getRefToRoleMap(Relation relation) {
-        def refToRole = new TreeMap<String, String>()
-        for (i in relation.getMembers()) {
-            refToRole.put(i.member.get("ref"), i.role);
-        }
-        return refToRole;
-    }
-
-    static def regexpSearch(String search) {
-        def setting = new SearchAction.SearchSetting()
-        setting.text = search
-        setting.regexSearch = true
-        return setting
-    }
-
-    @Test
-    public void testCreate1() {
-        def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
-        def mp = CreateMultipolygonAction.createMultipolygonCommand(ds.getWays(), null)
-        assert mp.a.getDescriptionText() == "Sequence: Create multipolygon"
-        assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer, 1.1.2:outer, 1.2:inner]"
-    }
-
-    @Test
-    public void testCreate2() {
-        def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
-        def ways = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1."))
-        def mp = CreateMultipolygonAction.createMultipolygonCommand(ways as Collection<Way>, null)
-        assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1.1:inner, 1.1.2:inner]"
-    }
-
-    @Test
-    public void testUpdate1() {
-        def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
-        def ways = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile(regexpSearch("ref=\".*1\$\"")))
-        def mp = CreateMultipolygonAction.createMultipolygonCommand(ways as Collection<Way>, null)
-        assert mp.b.getMembersCount() == 3
-        assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer]"
-        def ways2 = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile(regexpSearch("ref=1.2")))
-        def mp2 = CreateMultipolygonAction.createMultipolygonCommand(ways2 as Collection<Way>, mp.b)
-        assert mp2.b.getMembersCount() == 4
-        assert getRefToRoleMap(mp2.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer, 1.2:inner]"
-    }
-
-    @Test
-    public void testUpdate2() {
-        def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
-        def ways = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1.1"))
-        def mp = CreateMultipolygonAction.createMultipolygonCommand(ways as Collection<Way>, null)
-        assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1.1:inner]"
-        def ways2 = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile(regexpSearch("ref=1.1 OR ref=1.2 OR ref=1.1.2")))
-        def mp2 = CreateMultipolygonAction.createMultipolygonCommand(ways2 as Collection<Way>, mp.b)
-        assert getRefToRoleMap(mp2.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer, 1.1.2:outer, 1.2:inner]"
-    }
-}
diff --git a/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java b/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java
new file mode 100644
index 0000000..33703b3
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java
@@ -0,0 +1,97 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.FileInputStream;
+import java.util.Collection;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
+import org.openstreetmap.josm.actions.search.SearchCompiler;
+import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit test of {@link CreateMultipolygonAction}
+ */
+public class CreateMultipolygonActionTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().projection();
+
+    private static Map<String, String> getRefToRoleMap(Relation relation) {
+        Map<String, String> refToRole = new TreeMap<>();
+        for (RelationMember i : relation.getMembers()) {
+            refToRole.put(i.getMember().get("ref"), i.getRole());
+        }
+        return refToRole;
+    }
+
+    private static SearchSetting regexpSearch(String search) {
+        SearchSetting setting = new SearchSetting();
+        setting.text = search;
+        setting.regexSearch = true;
+        return setting;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Pair<SequenceCommand, Relation> createMultipolygonCommand(Collection<Way> ways, String pattern, Relation r)
+            throws ParseError {
+        return CreateMultipolygonAction.createMultipolygonCommand(
+            (Collection<Way>) (Collection<?>) SubclassFilteredCollection.filter(ways, SearchCompiler.compile(regexpSearch(pattern))), r);
+    }
+
+    @Test
+    public void testCreate1() throws Exception {
+        DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+        Pair<SequenceCommand, Relation> mp = CreateMultipolygonAction.createMultipolygonCommand(ds.getWays(), null);
+        assertEquals("Sequence: Create multipolygon", mp.a.getDescriptionText());
+        assertEquals("{1=outer, 1.1=inner, 1.1.1=outer, 1.1.2=outer, 1.2=inner}", getRefToRoleMap(mp.b).toString());
+    }
+
+    @Test
+    public void testCreate2() throws Exception {
+        DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+        Pair<SequenceCommand, Relation> mp = createMultipolygonCommand(ds.getWays(), "ref=1 OR ref:1.1.", null);
+        assertEquals("{1=outer, 1.1.1=inner, 1.1.2=inner}", getRefToRoleMap(mp.b).toString());
+    }
+
+    @Test
+    public void testUpdate1() throws Exception {
+        DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+        Pair<SequenceCommand, Relation> mp = createMultipolygonCommand(ds.getWays(), "ref=\".*1$\"", null);
+        assertEquals(3, mp.b.getMembersCount());
+        assertEquals("{1=outer, 1.1=inner, 1.1.1=outer}", getRefToRoleMap(mp.b).toString());
+        Pair<SequenceCommand, Relation> mp2 = createMultipolygonCommand(ds.getWays(), "ref=1.2", mp.b);
+        assertEquals(4, mp2.b.getMembersCount());
+        assertEquals("{1=outer, 1.1=inner, 1.1.1=outer, 1.2=inner}", getRefToRoleMap(mp2.b).toString());
+    }
+
+    @Test
+    public void testUpdate2() throws Exception {
+        DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+        Pair<SequenceCommand, Relation> mp = createMultipolygonCommand(ds.getWays(), "ref=1 OR ref:1.1.1", null);
+        assertEquals("{1=outer, 1.1.1=inner}", getRefToRoleMap(mp.b).toString());
+        Pair<SequenceCommand, Relation> mp2 = createMultipolygonCommand(ds.getWays(), "ref=1.1 OR ref=1.2 OR ref=1.1.2", mp.b);
+        assertEquals("{1=outer, 1.1=inner, 1.1.1=outer, 1.1.2=outer, 1.2=inner}", getRefToRoleMap(mp2.b).toString());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java b/test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java
new file mode 100644
index 0000000..52cc7fa
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java
@@ -0,0 +1,43 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link DeleteLayerAction}.
+ */
+public final class DeleteLayerActionTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform();
+
+    /**
+     * Unit test of {@link DeleteLayerAction#actionPerformed}
+     */
+    @Test
+    public void testActionPerformed() {
+        DeleteLayerAction action = new DeleteLayerAction();
+        // No layer
+        action.actionPerformed(null);
+        // OsmDataLayer
+        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
+        Main.getLayerManager().addLayer(layer);
+        assertNotNull(Main.getLayerManager().getActiveLayer());
+        action.actionPerformed(null);
+        assertNull(Main.getLayerManager().getActiveLayer());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/ExitActionTest.java b/test/unit/org/openstreetmap/josm/actions/ExitActionTest.java
new file mode 100644
index 0000000..7612752
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/ExitActionTest.java
@@ -0,0 +1,38 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.ExpectedSystemExit;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link ExitAction}.
+ */
+public final class ExitActionTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform();
+
+    /**
+     * System.exit rule
+     */
+    @Rule
+    public final ExpectedSystemExit exit = ExpectedSystemExit.none();
+
+    /**
+     * Unit test of {@link ExitAction#actionPerformed}
+     */
+    @Test
+    public void testActionPerformed() {
+        exit.expectSystemExitWithStatus(0);
+        // No layer
+        new ExitAction().actionPerformed(null);
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/MergeNodesActionTest.java b/test/unit/org/openstreetmap/josm/actions/MergeNodesActionTest.java
new file mode 100644
index 0000000..165318f
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/MergeNodesActionTest.java
@@ -0,0 +1,77 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link MergeNodesAction}.
+ */
+public class MergeNodesActionTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform().commands();
+
+    /**
+     * Unit test of {@link MergeNodesAction#selectTargetLocationNode} - empty list
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSelectTargetLocationNodeEmpty() {
+        MergeNodesAction.selectTargetLocationNode(Collections.emptyList());
+    }
+
+    /**
+     * Unit test of {@link MergeNodesAction#selectTargetLocationNode} - invalid mode
+     */
+    @Test(expected = IllegalStateException.class)
+    public void testSelectTargetLocationNodeInvalidMode() {
+        Main.pref.putInteger("merge-nodes.mode", -1);
+        MergeNodesAction.selectTargetLocationNode(Arrays.asList(new Node(0), new Node(1)));
+    }
+
+    /**
+     * Unit test of {@link MergeNodesAction#selectTargetLocationNode}
+     */
+    @Test
+    public void testSelectTargetLocationNode() {
+        Main.pref.putInteger("merge-nodes.mode", 0);
+        assertEquals(1, MergeNodesAction.selectTargetLocationNode(Arrays.asList(new Node(0), new Node(1))).getId());
+
+        Main.pref.putInteger("merge-nodes.mode", 1);
+        assertEquals(LatLon.ZERO, MergeNodesAction.selectTargetLocationNode(
+                Arrays.asList(new Node(LatLon.NORTH_POLE), new Node(LatLon.SOUTH_POLE))).getCoor());
+
+        Main.pref.putInteger("merge-nodes.mode", 2);
+        assertEquals(LatLon.NORTH_POLE, MergeNodesAction.selectTargetLocationNode(
+                Arrays.asList(new Node(LatLon.NORTH_POLE))).getCoor());
+    }
+
+    /**
+     * Unit test of {@link MergeNodesAction#selectTargetNode}
+     */
+    @Test
+    public void testSelectTargetNode() {
+        assertNull(MergeNodesAction.selectTargetNode(Collections.emptyList()));
+        DataSet ds = new DataSet();
+        Node n1 = new Node(1);
+        ds.addPrimitive(n1);
+        assertEquals(1, MergeNodesAction.selectTargetNode(Arrays.asList(n1)).getId());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/SessionSaveAsActionTest.java b/test/unit/org/openstreetmap/josm/actions/SessionSaveAsActionTest.java
new file mode 100644
index 0000000..e01b53e
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/SessionSaveAsActionTest.java
@@ -0,0 +1,33 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link SessionSaveAsAction}.
+ */
+public class SessionSaveAsActionTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform();
+
+    /**
+     * Unit test of {@link SessionSaveAsAction#actionPerformed}
+     */
+    @Test
+    public void testSessionSaveAsAction() {
+        SessionSaveAsAction action = new SessionSaveAsAction();
+        assertFalse(action.isEnabled());
+        action.actionPerformed(null);
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java b/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java
index 0b01a1c..c3a4870 100644
--- a/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java
@@ -2,17 +2,25 @@
 package org.openstreetmap.josm.actions;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.stream.Stream;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Unit tests for class {@link SimplifyWayAction}.
@@ -96,4 +104,25 @@ public final class SimplifyWayActionTest {
             Main.getLayerManager().removeLayer(layer);
         }
     }
+
+    /**
+     * Tests that also the first node may be simplified, see #13094.
+     */
+    @Test
+    public void testSimplifyFirstNode() {
+        final DataSet ds = new DataSet();
+        final Node n1 = new Node(new LatLon(47.26269614984, 11.34044231149));
+        final Node n2 = new Node(new LatLon(47.26274590831, 11.34053120859));
+        final Node n3 = new Node(new LatLon(47.26276562382, 11.34034715039));
+        final Node n4 = new Node(new LatLon(47.26264639132, 11.34035341438));
+        final Way w = new Way();
+        Stream.of(n1, n2, n3, n4, w).forEach(ds::addPrimitive);
+        Stream.of(n1, n2, n3, n4, n1).forEach(w::addNode);
+        final SequenceCommand command = action.simplifyWay(w);
+        assertNotNull(command);
+        assertEquals(2, command.getChildren().size());
+        final Collection<DeleteCommand> deleteCommands = Utils.filteredCollection(command.getChildren(), DeleteCommand.class);
+        assertEquals(1, deleteCommands.size());
+        assertEquals(Collections.singleton(n1), deleteCommands.iterator().next().getParticipatingPrimitives());
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java
index b240972..41dbd88 100644
--- a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java
@@ -41,6 +41,9 @@ public class DownloadGpsTaskTest {
         assertTrue(task.acceptsUrl("http://api.openstreetmap.org/trace/5000/data"));
         assertTrue(task.acceptsUrl("http://www.openstreetmap.org/trace/5000/data"));
         assertTrue(task.acceptsUrl("http://www.trackmyjourney.co.uk/exportgpx.php?session=S6rZR2Bh6GwX1wpB0C&trk=79292"));
+        assertTrue(task.acceptsUrl("https://www.openstreetmap.org/user/simon04/traces/750057"));
+        assertTrue(task.acceptsUrl("https://www.openstreetmap.org/edit?gpx=750057"));
+        assertTrue(task.acceptsUrl("http://www.openstreetmap.org/edit?gpx=2277313#map=14/-20.7321/-40.5328"));
         assertTrue(task.acceptsUrl(REMOTE_FILE));
     }
 
diff --git a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
index 1c52f3a..bb532dd 100644
--- a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
@@ -8,6 +8,7 @@ import static org.junit.Assert.fail;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -448,4 +449,17 @@ public class SearchCompilerTest {
         assertTrue(SearchCompiler.compile(search2).match(tag1));
         assertTrue(SearchCompiler.compile(search2).match(tag2));
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/13870">Bug #13870</a>.
+     * @throws ParseError always
+     */
+    @Test(expected = ParseError.class)
+    public void testPattern13870() throws ParseError {
+        // https://bugs.openjdk.java.net/browse/JI-9044959
+        SearchSetting setting = new SearchSetting();
+        setting.regexSearch = true;
+        setting.text = "[";
+        SearchCompiler.compile(setting);
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java b/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
index 0a7905c..7b15f6c 100644
--- a/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
+++ b/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
@@ -1,10 +1,20 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.corrector;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.data.correction.TagCorrection;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -38,6 +48,10 @@ public class ReverseWayTagCorrectorTest {
             assertSwitch(new Tag(k, "down"), new Tag(k, "up"));
             assertSwitch(new Tag(k, "something"), new Tag(k, "something"));
         }
+        // direction=forward/backward/...
+        assertSwitch(new Tag("direction", "forward"), new Tag("direction", "backward"));
+        assertSwitch(new Tag("direction", "backward"), new Tag("direction", "forward"));
+        assertSwitch(new Tag("direction", "north"), new Tag("direction", "south"));
         // :left/:right with oneway (see #10977)
         assertSwitch(new Tag("cycleway:left:oneway", "-1"), new Tag("cycleway:right:oneway", "yes"));
         // :forward/:backward (see #8518)
@@ -98,4 +112,33 @@ public class ReverseWayTagCorrectorTest {
     private void assertSwitch(Tag oldTag, Tag newTag) {
         Assert.assertEquals(ReverseWayTagCorrector.TagSwitcher.apply(oldTag), newTag);
     }
+
+    private Map<OsmPrimitive, List<TagCorrection>> getTagCorrectionsForWay(String middleNodeTags) {
+        final OsmPrimitive n1 = OsmUtils.createPrimitive("node");
+        final OsmPrimitive n2 = OsmUtils.createPrimitive("node " + middleNodeTags);
+        final OsmPrimitive n3 = OsmUtils.createPrimitive("node");
+        final Way w = new Way();
+        Stream.of(n1, n2, n3).map(Node.class::cast).forEach(w::addNode);
+        return ReverseWayTagCorrector.getTagCorrectionsMap(w);
+    }
+
+    /**
+     * Test tag correction on way nodes
+     */
+    @Test
+    public void testSwitchingWayNodes() {
+        final Map<OsmPrimitive, List<TagCorrection>> tagCorrections = getTagCorrectionsForWay("direction=forward");
+        Assert.assertEquals(1, tagCorrections.size());
+        Assert.assertEquals(Collections.singletonList(new TagCorrection("direction", "forward", "direction", "backward")),
+                tagCorrections.values().iterator().next());
+    }
+
+    /**
+     * Test tag correction on way nodes are not applied for absolute values such as compass cardinal directions
+     */
+    @Test
+    public void testNotSwitchingWayNodes() {
+        Assert.assertEquals(0, getTagCorrectionsForWay("direction=SSW").size());
+        Assert.assertEquals(0, getTagCorrectionsForWay("direction=145").size());
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java b/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java
index ce6b72c..c75d9af 100644
--- a/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java
+++ b/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java
@@ -13,7 +13,8 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Calendar;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -86,10 +87,7 @@ public class AutosaveTaskTest {
     public void testGetNewLayerFile() throws IOException {
         Files.createDirectories(task.getAutosaveDir());
         AutosaveLayerInfo info = new AutosaveLayerInfo(new OsmDataLayer(new DataSet(), "layer", null));
-        Calendar cal = Calendar.getInstance();
-        cal.set(2016, 0, 1, 1, 2, 3);
-        cal.set(Calendar.MILLISECOND, 456);
-        Date fixed = cal.getTime();
+        Date fixed = Date.from(ZonedDateTime.of(2016, 1, 1, 1, 2, 3, 456_000_000, ZoneId.systemDefault()).toInstant());
 
         AutosaveTask.PROP_INDEX_LIMIT.put(5);
         for (int i = 0; i <= AutosaveTask.PROP_INDEX_LIMIT.get() + 2; i++) {
diff --git a/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java b/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
index 22c5e85..a87d7e3 100644
--- a/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
+++ b/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
@@ -2,11 +2,14 @@
 package org.openstreetmap.josm.data.coor;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.text.DecimalFormat;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -22,7 +25,7 @@ public class LatLonTest {
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().projection();
 
     private static final double EPSILON = 1e-6;
 
@@ -100,6 +103,19 @@ public class LatLonTest {
     }
 
     /**
+     * Test {@link LatLon#toIntervalLat}
+     */
+    @Test
+    public void testToIntervalLat() {
+        assertEquals(-90.0, LatLon.toIntervalLat(-90.0), 0);
+        assertEquals(0.0, LatLon.toIntervalLat(0.0), 0);
+        assertEquals(90.0, LatLon.toIntervalLat(90.0), 0);
+
+        assertEquals(-90.0, LatLon.toIntervalLat(-91.0), 0);
+        assertEquals(90.0, LatLon.toIntervalLat(91.0), 0);
+    }
+
+    /**
      * Test of {@link LatLon#toIntervalLon}
      */
     @Test
@@ -135,6 +151,16 @@ public class LatLonTest {
     }
 
     /**
+     * Unit test of {@link LatLon#LatLon(LatLon)}.
+     */
+    @Test
+    public void testCopyConstructor() {
+        assertEquals(LatLon.NORTH_POLE, new LatLon(LatLon.NORTH_POLE));
+        assertEquals(LatLon.SOUTH_POLE, new LatLon(LatLon.SOUTH_POLE));
+        assertEquals(new LatLon(1, 2), new LatLon(new LatLon(1, 2)));
+    }
+
+    /**
      * Test of {@link LatLon#bearing}
      */
     @Test
@@ -149,11 +175,32 @@ public class LatLonTest {
     }
 
     /**
-     * Tests the methods {@link LatLon#latToString(CoordinateFormat)}, {@link LatLon#lonToString(CoordinateFormat)}.
+     * Test of {@link LatLon#distance}
+     */
+    @Test
+    public void testDistance() {
+        assertEquals(0.0, LatLon.ZERO.distance(LatLon.ZERO), 0);
+        assertEquals(90.0, LatLon.ZERO.distance(LatLon.NORTH_POLE), 0);
+        assertEquals(180.0, LatLon.SOUTH_POLE.distance(LatLon.NORTH_POLE), 0);
+    }
+
+    /**
+     * Test of {@link LatLon#distanceSq}
+     */
+    @Test
+    public void testDistanceSq() {
+        assertEquals(0.0, LatLon.ZERO.distanceSq(LatLon.ZERO), 0);
+        assertEquals(90d*90d, LatLon.ZERO.distanceSq(LatLon.NORTH_POLE), 0);
+        assertEquals(180d*180d, LatLon.SOUTH_POLE.distanceSq(LatLon.NORTH_POLE), 0);
+    }
+
+    /**
+     * Tests the methods {@link LatLon#latToString}, {@link LatLon#lonToString}, {@link LatLon#toStringCSV}.
      */
     @Test
     public void testFormatting() {
         LatLon c = new LatLon(47.000000, 19.000000);
+        assertEquals("47.0;19.0", c.toStringCSV(";"));
         assertEquals("47.0", c.latToString(CoordinateFormat.DECIMAL_DEGREES));
         assertEquals("19.0", c.lonToString(CoordinateFormat.DECIMAL_DEGREES));
         assertEquals("47°00'00.0\"N", c.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
@@ -162,11 +209,15 @@ public class LatLonTest {
         assertEquals("19°00.000'E", c.lonToString(CoordinateFormat.NAUTICAL));
         assertEquals("5942074.0724311", c.latToString(CoordinateFormat.EAST_NORTH));
         assertEquals("2115070.3250722", c.lonToString(CoordinateFormat.EAST_NORTH));
+        c = new LatLon(-47.000000, -19.000000);
+        assertEquals("47°00'00.0\"S", c.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
+        assertEquals("19°00'00.0\"W", c.lonToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
+        assertEquals("47°00.000'S", c.latToString(CoordinateFormat.NAUTICAL));
+        assertEquals("19°00.000'W", c.lonToString(CoordinateFormat.NAUTICAL));
     }
 
     /**
      * Test {@link LatLon#interpolate(LatLon, double)}
-     * @since 10915
      */
     @Test
     public void testInterpolate() {
@@ -186,8 +237,43 @@ public class LatLonTest {
     }
 
     /**
+     * Test {@link LatLon#isOutSideWorld}
+     */
+    @Test
+    public void testIsOutSideWorld() {
+        assertFalse(LatLon.ZERO.isOutSideWorld());
+        assertTrue(LatLon.NORTH_POLE.isOutSideWorld());
+        assertTrue(LatLon.SOUTH_POLE.isOutSideWorld());
+        assertTrue(new LatLon(-181, 0).isOutSideWorld());
+        assertTrue(new LatLon(181, 0).isOutSideWorld());
+    }
+
+    /**
+     * Test {@link LatLon#isValid}
+     */
+    @Test
+    public void testIsValid() {
+        assertTrue(LatLon.ZERO.isValid());
+        assertTrue(LatLon.NORTH_POLE.isValid());
+        assertTrue(LatLon.SOUTH_POLE.isValid());
+
+        assertFalse(new LatLon(-91, 0).isValid());
+        assertFalse(new LatLon(91, 0).isValid());
+        assertFalse(new LatLon(0, -181).isValid());
+        assertFalse(new LatLon(0, 181).isValid());
+    }
+
+    /**
+     * Test {@link LatLon#isWithin}
+     */
+    @Test
+    public void testIsWithin() {
+        assertTrue(LatLon.ZERO.isWithin(new Bounds(LatLon.ZERO)));
+        assertFalse(LatLon.ZERO.isWithin(new Bounds(LatLon.NORTH_POLE)));
+    }
+
+    /**
      * Test {@link LatLon#getCenter(LatLon)}
-     * @since 10915
      */
     @Test
     public void testGetCenter() {
@@ -203,4 +289,48 @@ public class LatLonTest {
         assertEquals(30, ll2.getCenter(ll1).lon(), 1e-10);
         assertEquals(10, ll3.getCenter(ll2).lon(), 1e-10);
     }
+
+    /**
+     * Unit test of {@link LatLon#parse} method.
+     */
+    @Test
+    public void testParse() {
+        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("49.29918° 19.24788°"));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("N 49.29918 E 19.24788°"));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("49.29918° 19.24788°"));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("N 49.29918 E 19.24788"));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("n 49.29918 e 19.24788"));
+        assertEquals(new LatLon(-19 - 24.788 / 60, -49 - 29.918 / 60), LatLon.parse("W 49°29.918' S 19°24.788'"));
+        assertEquals(new LatLon(-19 - 24.788 / 60, -49 - 29.918 / 60), LatLon.parse("w 49°29.918' s 19°24.788'"));
+        assertEquals(new LatLon(49 + 29. / 60 + 04. / 3600, 19 + 24. / 60 + 43. / 3600), LatLon.parse("N 49°29'04\" E 19°24'43\""));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("49.29918 N, 19.24788 E"));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("49.29918 n, 19.24788 e"));
+        assertEquals(new LatLon(49 + 29. / 60 + 21. / 3600, 19 + 24. / 60 + 38. / 3600), LatLon.parse("49°29'21\" N 19°24'38\" E"));
+        assertEquals(new LatLon(49 + 29. / 60 + 51. / 3600, 19 + 24. / 60 + 18. / 3600), LatLon.parse("49 29 51, 19 24 18"));
+        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLon.parse("49 29, 19 24"));
+        assertEquals(new LatLon(19 + 24. / 60, 49 + 29. / 60), LatLon.parse("E 49 29, N 19 24"));
+        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLon.parse("49° 29; 19° 24"));
+        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLon.parse("49° 29; 19° 24"));
+        assertEquals(new LatLon(49 + 29. / 60, -19 - 24. / 60), LatLon.parse("N 49° 29, W 19° 24"));
+        assertEquals(new LatLon(-49 - 29.5 / 60, 19 + 24.6 / 60), LatLon.parse("49° 29.5 S, 19° 24.6 E"));
+        assertEquals(new LatLon(49 + 29.918 / 60, 19 + 15.88 / 60), LatLon.parse("N 49 29.918 E 19 15.88"));
+        assertEquals(new LatLon(49 + 29.4 / 60, 19 + 24.5 / 60), LatLon.parse("49 29.4 19 24.5"));
+        assertEquals(new LatLon(-49 - 29.4 / 60, 19 + 24.5 / 60), LatLon.parse("-49 29.4 N -19 24.5 W"));
+    }
+
+    /**
+     * Unit test of {@link LatLon#parse} method - invalid case 1.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseInvalid1() {
+        LatLon.parse("48°45'S 23°30'S");
+    }
+
+    /**
+     * Unit test of {@link LatLon#parse} method - invalid case 2.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseInvalid2() {
+        LatLon.parse("47°45'N 24°00'S");
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java b/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java
new file mode 100644
index 0000000..6960185
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java
@@ -0,0 +1,30 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.correction;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Unit tests for class {@link TagCorrection}.
+ */
+public class TagCorrectionTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Unit test of methods {@link TagCorrection#equals} and {@link TagCorrection#hashCode}.
+     */
+    @Test
+    public void testEqualsContract() {
+        EqualsVerifier.forClass(TagCorrection.class).usingGetClass().verify();
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java b/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
index 1197127..a615241 100644
--- a/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
+++ b/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
@@ -10,6 +10,7 @@ import org.junit.Test;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -38,7 +39,7 @@ public class OAuthParametersTest {
         OAuthParameters dev = OAuthParameters.createDefault("http://api06.dev.openstreetmap.org/api");
         assertNotNull(dev);
         assertNotEquals(def, dev);
-        Main.logLevel = 5; // enable trace for line coverage
+        Logging.setLogLevel(Logging.LEVEL_TRACE); // enable trace for line coverage
         assertEquals(def, OAuthParameters.createDefault("wrong_url"));
         OAuthParameters dev2 = new OAuthParameters(dev);
         assertEquals(dev, dev2);
diff --git a/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java b/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
index 8818041..7bf63f8 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
@@ -2,6 +2,7 @@
 package org.openstreetmap.josm.data.osm;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -11,6 +12,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -103,6 +105,13 @@ public class APIDataSetTest {
         List<OsmPrimitive> toUpdate = apiDataSet.getPrimitivesToUpdate();
         assertEquals(1, toUpdate.size());
         assertEquals(r4, toUpdate.get(0));
+
+        final ConflictCollection cc4 = new ConflictCollection();
+        cc4.add(r4, r4);
+        assertTrue(apiDataSet.participatesInConflict(cc4));
+        final ConflictCollection cc1 = new ConflictCollection();
+        cc1.add(r1, r1);
+        assertFalse(apiDataSet.participatesInConflict(cc1));
     }
 
     @Test
diff --git a/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.groovy b/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.groovy
deleted file mode 100644
index 835e821..0000000
--- a/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.groovy
+++ /dev/null
@@ -1,164 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
-
-import static org.junit.Assert.*
-
-import org.junit.Test
-
-class ChangesetCacheTest {
-
-    @Test
-    public void testConstructor() {
-        ChangesetCache cache = ChangesetCache.getInstance()
-        assert cache != null
-    }
-
-    @Test
-    public void testAddAndRemoveListeners() {
-        ChangesetCache cache = ChangesetCache.getInstance()
-        cache.clear()
-
-        // should work
-        cache.addChangesetCacheListener null
-
-        // should work
-        def listener = new ChangesetCacheListener() {
-            public void changesetCacheUpdated(ChangesetCacheEvent event) {}
-        }
-        cache.addChangesetCacheListener listener
-        // adding a second time - should work too
-        cache.addChangesetCacheListener listener
-        assert cache. at listeners.size() == 1 // ... but only added once
-
-        cache.removeChangesetCacheListener null
-
-        cache.removeChangesetCacheListener listener
-        assert cache. at listeners.size() == 0
-    }
-
-    @Test
-    public void updateGetRemoveCycle() {
-        ChangesetCache cache = ChangesetCache.getInstance()
-        cache.clear()
-
-        cache.update new Changeset(1)
-        assert cache.size() == 1
-        assert cache.get(1) != null
-        assert cache.get(1).id == 1
-        cache.remove(1)
-        assert cache.size() == 0
-    }
-
-    @Test
-    public void updateTwice() {
-        ChangesetCache cache = ChangesetCache.getInstance()
-        cache.clear()
-
-        Changeset cs = new Changeset(1)
-        cs.incomplete = false
-        cs.put "key1", "value1"
-        cs.open = true
-        cache.update cs
-
-        Changeset cs2 = new Changeset(cs)
-        assert cs2 != null
-        cs2.put "key2", "value2"
-        cs2.open = false
-        cache.update(cs2)
-
-        assert cache.size() == 1
-        assert cache.get(1) != null
-
-        cs = cache.get(1)
-        assert cs.get("key1") == "value1"
-        assert cs.get("key2") == "value2"
-        assert !cs.open
-    }
-
-
-    @Test
-    public void contains() {
-        ChangesetCache cache = ChangesetCache.getInstance()
-        cache. at listeners.clear()
-        cache.clear()
-
-
-        Changeset cs = new Changeset(1)
-        cache.update cs
-
-        assert cache.contains(1)
-        assert cache.contains(cs)
-        assert cache.contains(new Changeset(cs))
-
-        assert ! cache.contains(2)
-        assert ! cache.contains(new Changeset(2))
-        assert ! cache.contains(null)
-    }
-
-    @Test
-    public void fireingEventsAddAChangeset() {
-        ChangesetCache cache = ChangesetCache.getInstance()
-        cache.clear()
-        cache. at listeners.clear()
-
-        // should work
-        def listener = new ChangesetCacheListener() {
-                    public void changesetCacheUpdated(ChangesetCacheEvent event) {
-                        assert event != null
-                        assert event.getAddedChangesets().size() == 1
-                        assert event.getRemovedChangesets().empty
-                        assert event.getUpdatedChangesets().empty
-                        assert event.getSource() == cache
-                    }
-        }
-        cache.addChangesetCacheListener listener
-        cache.update(new Changeset(1))
-        cache.removeChangesetCacheListener listener
-    }
-
-    @Test
-    public void fireingEventsUpdateChangeset() {
-        ChangesetCache cache = ChangesetCache.getInstance()
-        cache.clear()
-        cache. at listeners.clear()
-
-        // should work
-        def listener = new ChangesetCacheListener() {
-                    public void changesetCacheUpdated(ChangesetCacheEvent event) {
-                        assert event != null
-                        assert event.getAddedChangesets().empty
-                        assert event.getRemovedChangesets().empty
-                        assert event.getUpdatedChangesets().size() == 1
-                        assert event.getSource() == cache
-                    }
-                }
-        cache.update(new Changeset(1))
-
-        cache.addChangesetCacheListener listener
-        cache.update(new Changeset(1))
-        cache.removeChangesetCacheListener listener
-    }
-
-    @Test
-    public void fireingEventsRemoveChangeset() {
-        ChangesetCache cache = ChangesetCache.getInstance()
-        cache.clear()
-        cache. at listeners.clear()
-
-        // should work
-        def listener = new ChangesetCacheListener() {
-                    public void changesetCacheUpdated(ChangesetCacheEvent event) {
-                        assert event != null
-                        assert event.getAddedChangesets().empty
-                        assert event.getRemovedChangesets().size() == 1
-                        assert event.getUpdatedChangesets().empty
-                        assert event.getSource() == cache
-                    }
-                }
-        cache.update(new Changeset(1))
-
-        cache.addChangesetCacheListener listener
-        cache.remove 1
-        cache.removeChangesetCacheListener listener
-    }
-}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java b/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java
new file mode 100644
index 0000000..4375a41
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java
@@ -0,0 +1,215 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+
+/**
+ * Unit test of {@link ChangesetCache}
+ */
+public class ChangesetCacheTest {
+
+    /**
+     * Unit test of {@link ChangesetCache#ChangesetCache}
+     */
+    @Test
+    public void testConstructor() {
+        assertNotNull(ChangesetCache.getInstance());
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<ChangesetCacheListener> getListeners(ChangesetCache cache) throws ReflectiveOperationException {
+        return (List<ChangesetCacheListener>) TestUtils.getPrivateField(cache, "listeners");
+    }
+
+    @Test
+    public void testAddAndRemoveListeners() throws ReflectiveOperationException {
+        ChangesetCache cache = ChangesetCache.getInstance();
+        cache.clear();
+
+        // should work
+        cache.addChangesetCacheListener(null);
+
+        // should work
+        ChangesetCacheListener listener = new ChangesetCacheListener() {
+            @Override
+            public void changesetCacheUpdated(ChangesetCacheEvent event) {}
+        };
+        cache.addChangesetCacheListener(listener);
+        // adding a second time - should work too
+        cache.addChangesetCacheListener(listener);
+        assertEquals(1, getListeners(cache).size()); // ... but only added once
+
+        cache.removeChangesetCacheListener(null);
+
+        cache.removeChangesetCacheListener(listener);
+        assertTrue(getListeners(cache).isEmpty());
+    }
+
+    @Test
+    public void testUpdateGetRemoveCycle() {
+        ChangesetCache cache = ChangesetCache.getInstance();
+        cache.clear();
+
+        cache.update(new Changeset(1));
+        assertEquals(1, cache.size());
+        assertNotNull(cache.get(1));
+        assertEquals(1, cache.get(1).getId());
+        cache.remove(1);
+        assertEquals(0, cache.size());
+    }
+
+    @Test
+    public void testUpdateTwice() {
+        ChangesetCache cache = ChangesetCache.getInstance();
+        cache.clear();
+
+        Changeset cs = new Changeset(1);
+        cs.setIncomplete(false);
+        cs.put("key1", "value1");
+        cs.setOpen(true);
+        cache.update(cs);
+
+        Changeset cs2 = new Changeset(cs);
+        assertNotNull(cs2);
+        cs2.put("key2", "value2");
+        cs2.setOpen(false);
+        cache.update(cs2);
+
+        assertEquals(1, cache.size());
+        assertNotNull(cache.get(1));
+
+        cs = cache.get(1);
+        assertEquals("value1", cs.get("key1"));
+        assertEquals("value2", cs.get("key2"));
+        assertFalse(cs.isOpen());
+    }
+
+    @Test
+    public void testContains() throws ReflectiveOperationException {
+        ChangesetCache cache = ChangesetCache.getInstance();
+        getListeners(cache).clear();
+        cache.clear();
+
+        Changeset cs = new Changeset(1);
+        cache.update(cs);
+
+        assertTrue(cache.contains(1));
+        assertTrue(cache.contains(cs));
+        assertTrue(cache.contains(new Changeset(cs)));
+
+        assertFalse(cache.contains(2));
+        assertFalse(cache.contains(new Changeset(2)));
+        assertFalse(cache.contains(null));
+    }
+
+    @Test
+    public void testFireingEventsAddAChangeset() throws ReflectiveOperationException {
+        ChangesetCache cache = ChangesetCache.getInstance();
+        cache.clear();
+        getListeners(cache).clear();
+
+        // should work
+        ChangesetCacheListener listener = new ChangesetCacheListener() {
+            @Override
+            public void changesetCacheUpdated(ChangesetCacheEvent event) {
+                assertNotNull(event);
+                assertEquals(1, event.getAddedChangesets().size());
+                assertTrue(event.getRemovedChangesets().isEmpty());
+                assertTrue(event.getUpdatedChangesets().isEmpty());
+                assertEquals(cache, event.getSource());
+            }
+        };
+        cache.addChangesetCacheListener(listener);
+        cache.update(new Changeset(1));
+        cache.removeChangesetCacheListener(listener);
+    }
+
+    @Test
+    public void testFireingEventsUpdateChangeset() throws ReflectiveOperationException {
+        ChangesetCache cache = ChangesetCache.getInstance();
+        cache.clear();
+        getListeners(cache).clear();
+
+        // should work
+        ChangesetCacheListener listener = new ChangesetCacheListener() {
+            @Override
+            public void changesetCacheUpdated(ChangesetCacheEvent event) {
+                assertNotNull(event);
+                assertTrue(event.getAddedChangesets().isEmpty());
+                assertTrue(event.getRemovedChangesets().isEmpty());
+                assertEquals(1, event.getUpdatedChangesets().size());
+                assertEquals(cache, event.getSource());
+            }
+        };
+        cache.update(new Changeset(1));
+
+        cache.addChangesetCacheListener(listener);
+        cache.update(new Changeset(1));
+        cache.removeChangesetCacheListener(listener);
+    }
+
+    @Test
+    public void testFireingEventsRemoveChangeset() throws ReflectiveOperationException {
+        ChangesetCache cache = ChangesetCache.getInstance();
+        cache.clear();
+        getListeners(cache).clear();
+
+        // should work
+        ChangesetCacheListener listener = new ChangesetCacheListener() {
+            @Override
+            public void changesetCacheUpdated(ChangesetCacheEvent event) {
+                assertNotNull(event);
+                assertTrue(event.getAddedChangesets().isEmpty());
+                assertEquals(1, event.getRemovedChangesets().size());
+                assertTrue(event.getUpdatedChangesets().isEmpty());
+                assertEquals(cache, event.getSource());
+            }
+        };
+        cache.update(new Changeset(1));
+
+        cache.addChangesetCacheListener(listener);
+        cache.remove(1);
+        cache.removeChangesetCacheListener(listener);
+    }
+
+    /**
+     * Unit test of method {@link ChangesetCache#getOpenChangesets}.
+     */
+    @Test
+    public void testGetOpenChangesets() {
+        final ChangesetCache cache = ChangesetCache.getInstance();
+        // empty cache => empty list
+        Assert.assertTrue(
+                "Empty cache should produce an empty list.",
+                cache.getOpenChangesets().isEmpty()
+        );
+
+        // cache with only closed changesets => empty list
+        Changeset closedCs = new Changeset(1);
+        closedCs.setOpen(false);
+        cache.update(closedCs);
+        Assert.assertTrue(
+                "Cache with only closed changesets should produce an empty list.",
+                cache.getOpenChangesets().isEmpty()
+        );
+
+        // cache with open and closed changesets => list with only the open ones
+        Changeset openCs = new Changeset(2);
+        openCs.setOpen(true);
+        cache.update(openCs);
+        Assert.assertEquals(
+                Collections.singletonList(openCs),
+                cache.getOpenChangesets()
+        );
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java b/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java
new file mode 100644
index 0000000..375d5f2
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java
@@ -0,0 +1,66 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
+import org.openstreetmap.josm.data.osm.history.HistoryNode;
+import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link ChangesetDataSet}.
+ */
+public class ChangesetDataSetTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Unit test of method {@link ChangesetDataSet#getPrimitivesByModificationType}.
+     */
+    @Test
+    public void testGetPrimitivesByModificationType() {
+        final ChangesetDataSet cds = new ChangesetDataSet();
+        // empty object, null parameter => IllegalArgumentException
+        try {
+            cds.getPrimitivesByModificationType(null);
+            Assert.fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
+        } catch (IllegalArgumentException e) {
+            Main.trace(e);
+            // Was expected
+        }
+
+        // empty object, a modification type => empty list
+        Assert.assertTrue(
+            "Empty data set should produce an empty list.",
+            cds.getPrimitivesByModificationType(
+                    ChangesetModificationType.CREATED).isEmpty()
+        );
+
+        // object with various items and modification types, fetch for CREATED
+        // => list containing only the CREATED item
+        HistoryOsmPrimitive prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, new Date(), LatLon.ZERO);
+        HistoryOsmPrimitive prim2 = new HistoryNode(2, 1, true, User.createLocalUser("test"), 1, new Date(), LatLon.NORTH_POLE);
+        HistoryOsmPrimitive prim3 = new HistoryNode(3, 1, true, User.getAnonymous(), 1, new Date(), LatLon.SOUTH_POLE);
+        cds.put(prim1, ChangesetModificationType.CREATED);
+        cds.put(prim2, ChangesetModificationType.DELETED);
+        cds.put(prim3, ChangesetModificationType.UPDATED);
+        Set<HistoryOsmPrimitive> result = cds.getPrimitivesByModificationType(
+                    ChangesetModificationType.CREATED);
+        Assert.assertEquals("We should have found only one item.", 1, result.size());
+        Assert.assertTrue("The item found is prim1.", result.contains(prim1));
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java b/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
new file mode 100644
index 0000000..5fd188b
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
@@ -0,0 +1,70 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.openstreetmap.josm.data.osm.Changeset.MAX_CHANGESET_TAG_LENGTH;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link Changeset}.
+ */
+public class ChangesetTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Unit test of method {@link Changeset#setKeys}.
+     */
+    @Test
+    public void testSetKeys() {
+        final Changeset cs = new Changeset();
+        // Cannot add null map => IllegalArgumentException
+        try {
+            cs.setKeys(null);
+            Assert.fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
+        } catch (IllegalArgumentException e) {
+            Main.trace(e);
+            // Was expected
+        }
+
+        // Add a map with no values
+        // => the key list is empty
+        Map<String, String> keys = new HashMap<>();
+
+        // Add a map with valid values : null and short texts
+        // => all the items are in the keys
+        keys.put("empty", null);
+        keys.put("test", "test");
+        cs.setKeys(keys);
+        Assert.assertEquals("Both valid keys should have been put in the ChangeSet.", 2, cs.getKeys().size());
+
+        // Add a map with too long values => IllegalArgumentException
+        keys = new HashMap<>();
+        StringBuilder b = new StringBuilder(MAX_CHANGESET_TAG_LENGTH + 1);
+        for (int i = 0; i < MAX_CHANGESET_TAG_LENGTH + 1; i++) {
+           b.append("x");
+        }
+        keys.put("test", b.toString());
+        try {
+            cs.setKeys(keys);
+            Assert.fail("Should have thrown an IllegalArgumentException as we gave a too long value.");
+        } catch (IllegalArgumentException e) {
+            Main.trace(e);
+            // Was expected
+        }
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java b/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
index 7ca4b14..b9e01a7 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
@@ -10,10 +10,9 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.StringWriter;
+import java.time.Instant;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 import org.junit.After;
 import org.junit.Before;
@@ -25,7 +24,6 @@ import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Unit tests for class {@link DataSetMerger}.
  */
@@ -297,7 +295,6 @@ public class DataSetMergerTest {
     @Test
     public void testNodeSimpleNoIdSemanticallyEqual() {
 
-        Calendar cal = GregorianCalendar.getInstance();
         User myUser = User.createOsmUser(1111, "my");
 
         User theirUser = User.createOsmUser(222, "their");
@@ -306,16 +303,14 @@ public class DataSetMergerTest {
         n.setCoor(LatLon.ZERO);
         n.put("key1", "value1");
         n.setUser(myUser);
-        n.setTimestamp(cal.getTime());
+        n.setTimestamp(new Date());
 
         my.addPrimitive(n);
 
         Node n1 = new Node();
         n1.setCoor(LatLon.ZERO);
         n1.put("key1", "value1");
-        cal.add(Calendar.HOUR, 1);
-        Date timestamp = cal.getTime();
-        n1.setTimestamp(timestamp);
+        n1.setTimestamp(Date.from(Instant.now().plusSeconds(3600)));
         n1.setUser(theirUser);
         their.addPrimitive(n1);
 
diff --git a/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java b/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
new file mode 100644
index 0000000..c9b9deb
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
@@ -0,0 +1,57 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.Assert;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.List;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+/**
+ * Unit tests for class {@link DataSet}.
+ */
+public class DataSetTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Unit test of method {@link DataSet#searchRelations}.
+     */
+    @Test
+    public void testSearchRelations() {
+        final DataSet ds = new DataSet();
+        // null bbox => empty list
+        Assert.assertTrue(
+            "Empty data set should produce an empty list.",
+            ds.searchRelations(null).isEmpty()
+        );
+        
+        // empty data set, any bbox => empty list
+        BBox bbox = new BBox(LatLon.NORTH_POLE, LatLon.SOUTH_POLE);
+        Assert.assertTrue(
+            "Empty data set should produce an empty list.",
+            ds.searchRelations(bbox).isEmpty()
+        );
+        
+        // data set with elements in the given bbox => these elements
+        Node node = new Node(LatLon.ZERO);
+        Relation r = new Relation(1);
+        RelationMember rm = new RelationMember("role", node);
+        r.addMember(rm);
+        ds.addPrimitive(node);
+        ds.addPrimitive(r);
+        bbox = new BBox(new LatLon(-1.0, -1.0), new LatLon(1.0, 1.0));
+        List<Relation> result = ds.searchRelations(bbox);
+        Assert.assertEquals("We should have found only one item.", 1, result.size());
+        Assert.assertTrue("The item found is relation r.", result.contains(r));
+        
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.groovy b/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.groovy
deleted file mode 100644
index a20f3ff..0000000
--- a/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.groovy
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.openstreetmap.josm.data.osm
-
-class SimplePrimitiveIdTest extends GroovyTestCase {
-
-    void testNode() {
-        assert SimplePrimitiveId.fromString("node/123") == new SimplePrimitiveId(123, OsmPrimitiveType.NODE)
-        assert SimplePrimitiveId.fromString("n123") == new SimplePrimitiveId(123, OsmPrimitiveType.NODE)
-        assert SimplePrimitiveId.fromString("node123") == new SimplePrimitiveId(123, OsmPrimitiveType.NODE)
-        assert SimplePrimitiveId.fromString("n123456789123456789") == new SimplePrimitiveId(123456789123456789, OsmPrimitiveType.NODE)
-    }
-
-    void testWay() {
-        assert SimplePrimitiveId.fromString("way/123") == new SimplePrimitiveId(123, OsmPrimitiveType.WAY)
-        assert SimplePrimitiveId.fromString("w123") == new SimplePrimitiveId(123, OsmPrimitiveType.WAY)
-        assert SimplePrimitiveId.fromString("way123") == new SimplePrimitiveId(123, OsmPrimitiveType.WAY)
-        assert SimplePrimitiveId.fromString("w123456789123456789") == new SimplePrimitiveId(123456789123456789, OsmPrimitiveType.WAY)
-    }
-
-    void testRelation() {
-        assert SimplePrimitiveId.fromString("relation/123") == new SimplePrimitiveId(123, OsmPrimitiveType.RELATION)
-        assert SimplePrimitiveId.fromString("r123") == new SimplePrimitiveId(123, OsmPrimitiveType.RELATION)
-        assert SimplePrimitiveId.fromString("rel123") == new SimplePrimitiveId(123, OsmPrimitiveType.RELATION)
-        assert SimplePrimitiveId.fromString("relation123") == new SimplePrimitiveId(123, OsmPrimitiveType.RELATION)
-    }
-
-    void testBad() {
-        shouldFail { SimplePrimitiveId.fromString("foobar") }
-    }
-
-    void testFuzzy() {
-        assert SimplePrimitiveId.fuzzyParse("foo relation/123 bar").toString() == "[relation 123]"
-        assert SimplePrimitiveId.fuzzyParse("foo relation/123 and way/345 but also node/789").toString() == "[relation 123, way 345, node 789]"
-        assert SimplePrimitiveId.fuzzyParse("foo relation/123-24 and way/345-346 but also node/789").toString() == "[relation 123, relation 124, way 345, way 346, node 789]"
-    }
-
-    void testFromCopyAction() {
-        assert SimplePrimitiveId.fromString("node 123") == new SimplePrimitiveId(123, OsmPrimitiveType.NODE)
-        assert SimplePrimitiveId.fromString("way 123") == new SimplePrimitiveId(123, OsmPrimitiveType.WAY)
-        assert SimplePrimitiveId.fromString("relation 123") == new SimplePrimitiveId(123, OsmPrimitiveType.RELATION)
-    }
-
-    void testMultipleIDs() {
-        assert SimplePrimitiveId.multipleFromString("node/234").toString() == "[node 234]"
-        assert SimplePrimitiveId.multipleFromString("node/234-234").toString() == "[node 234]"
-        assert SimplePrimitiveId.multipleFromString("node/2-1").toString() == "[]"
-        assert SimplePrimitiveId.multipleFromString("node/123-124").toString() == "[node 123, node 124]"
-        assert SimplePrimitiveId.multipleFromString("n/123-124").toString() == "[node 123, node 124]"
-        assert SimplePrimitiveId.multipleFromString("node123-126").toString() == "[node 123, node 124, node 125, node 126]"
-        assert SimplePrimitiveId.multipleFromString("way/123-123").toString() == "[way 123]"
-        assert SimplePrimitiveId.multipleFromString("w/123-127").toString() == "[way 123, way 124, way 125, way 126, way 127]"
-        assert SimplePrimitiveId.multipleFromString("way123-125").toString() == "[way 123, way 124, way 125]"
-        assert SimplePrimitiveId.multipleFromString("relation/123-125").toString() == "[relation 123, relation 124, relation 125]"
-        assert SimplePrimitiveId.multipleFromString("r/123-125").toString() == "[relation 123, relation 124, relation 125]"
-        assert SimplePrimitiveId.multipleFromString("relation123-125").toString() == "[relation 123, relation 124, relation 125]"
-        assert SimplePrimitiveId.multipleFromString("node/234-5").toString() == "[node 234, node 235]"
-        assert SimplePrimitiveId.multipleFromString("node/234-35").toString() == "[node 234, node 235]"
-        assert SimplePrimitiveId.multipleFromString("node/234-235").toString() == "[node 234, node 235]"
-        assert SimplePrimitiveId.multipleFromString("node/998-1001").toString() == "[node 998, node 999, node 1000, node 1001]"
-        shouldFail { SimplePrimitiveId.multipleFromString("foo node123 bar") }
-    }
-}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.java b/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.java
new file mode 100644
index 0000000..8a200f1
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.java
@@ -0,0 +1,104 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Unit tests of {@link SimplePrimitiveId} class.
+ */
+public class SimplePrimitiveIdTest {
+
+    /**
+     * Unit test of {@link SimplePrimitiveId#fromString} for nodes.
+     */
+    @Test
+    public void testFromStringNode() {
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.NODE), SimplePrimitiveId.fromString("node/123"));
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.NODE), SimplePrimitiveId.fromString("n123"));
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.NODE), SimplePrimitiveId.fromString("node123"));
+        assertEquals(new SimplePrimitiveId(123456789123456789L, OsmPrimitiveType.NODE), SimplePrimitiveId.fromString("n123456789123456789"));
+    }
+
+    /**
+     * Unit test of {@link SimplePrimitiveId#fromString} for ways.
+     */
+    @Test
+    public void testFromStringWay() {
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.WAY), SimplePrimitiveId.fromString("way/123"));
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.WAY), SimplePrimitiveId.fromString("w123"));
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.WAY), SimplePrimitiveId.fromString("way123"));
+        assertEquals(new SimplePrimitiveId(123456789123456789L, OsmPrimitiveType.WAY), SimplePrimitiveId.fromString("w123456789123456789"));
+    }
+
+    /**
+     * Unit test of {@link SimplePrimitiveId#fromString} for relations.
+     */
+    @Test
+    public void testFromStringRelation() {
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.RELATION), SimplePrimitiveId.fromString("relation/123"));
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.RELATION), SimplePrimitiveId.fromString("r123"));
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.RELATION), SimplePrimitiveId.fromString("rel123"));
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.RELATION), SimplePrimitiveId.fromString("relation123"));
+    }
+
+    /**
+     * Unit test of {@link SimplePrimitiveId#fromString} for invalid input.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testFromStringBad() {
+        SimplePrimitiveId.fromString("foobar");
+    }
+
+    /**
+     * Unit test of {@link SimplePrimitiveId#fuzzyParse}.
+     */
+    @Test
+    public void testFuzzyParse() {
+        assertEquals("[relation 123]",
+                SimplePrimitiveId.fuzzyParse("foo relation/123 bar").toString());
+        assertEquals("[relation 123, way 345, node 789]",
+                SimplePrimitiveId.fuzzyParse("foo relation/123 and way/345 but also node/789").toString());
+        assertEquals("[relation 123, relation 124, way 345, way 346, node 789]",
+                SimplePrimitiveId.fuzzyParse("foo relation/123-24 and way/345-346 but also node/789").toString());
+    }
+
+    @Test
+    public void testFromCopyAction() {
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.NODE), SimplePrimitiveId.fromString("node 123"));
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.WAY), SimplePrimitiveId.fromString("way 123"));
+        assertEquals(new SimplePrimitiveId(123, OsmPrimitiveType.RELATION), SimplePrimitiveId.fromString("relation 123"));
+    }
+
+    /**
+     * Unit test of {@link SimplePrimitiveId#multipleFromString}.
+     */
+    @Test
+    public void testMultipleFromString() {
+        assertEquals("[node 234]", SimplePrimitiveId.multipleFromString("node/234").toString());
+        assertEquals("[node 234]", SimplePrimitiveId.multipleFromString("node/234-234").toString());
+        assertEquals("[]", SimplePrimitiveId.multipleFromString("node/2-1").toString());
+        assertEquals("[node 123, node 124]", SimplePrimitiveId.multipleFromString("node/123-124").toString());
+        assertEquals("[node 123, node 124]", SimplePrimitiveId.multipleFromString("n/123-124").toString());
+        assertEquals("[node 123, node 124, node 125, node 126]", SimplePrimitiveId.multipleFromString("node123-126").toString());
+        assertEquals("[way 123]", SimplePrimitiveId.multipleFromString("way/123-123").toString());
+        assertEquals("[way 123, way 124, way 125, way 126, way 127]", SimplePrimitiveId.multipleFromString("w/123-127").toString());
+        assertEquals("[way 123, way 124, way 125]", SimplePrimitiveId.multipleFromString("way123-125").toString());
+        assertEquals("[relation 123, relation 124, relation 125]", SimplePrimitiveId.multipleFromString("relation/123-125").toString());
+        assertEquals("[relation 123, relation 124, relation 125]", SimplePrimitiveId.multipleFromString("r/123-125").toString());
+        assertEquals("[relation 123, relation 124, relation 125]", SimplePrimitiveId.multipleFromString("relation123-125").toString());
+        assertEquals("[node 234, node 235]", SimplePrimitiveId.multipleFromString("node/234-5").toString());
+        assertEquals("[node 234, node 235]", SimplePrimitiveId.multipleFromString("node/234-35").toString());
+        assertEquals("[node 234, node 235]", SimplePrimitiveId.multipleFromString("node/234-235").toString());
+        assertEquals("[node 998, node 999, node 1000, node 1001]", SimplePrimitiveId.multipleFromString("node/998-1001").toString());
+    }
+
+    /**
+     * Unit test of {@link SimplePrimitiveId#multipleFromString} for invalid data.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testMultipleFromStringBad() {
+        SimplePrimitiveId.multipleFromString("foo node123 bar");
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java
new file mode 100644
index 0000000..c8ad1bf
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java
@@ -0,0 +1,38 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import java.util.stream.Collectors;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * JUnit Test of coastline validation test.
+ */
+public class CoastlinesTest {
+
+    private static final Coastlines COASTLINES = new Coastlines();
+    private static final WronglyOrderedWays WRONGLY_ORDERED_WAYS = new WronglyOrderedWays();
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().commands();
+
+    /**
+     * Test all error cases manually created in coastline.osm.
+     * @throws Exception in case of error
+     */
+    @Test
+    public void testCoastlineFile() throws Exception {
+        ValidatorTestUtils.testSampleFile("data_nodist/coastlines.osm",
+                ds -> ds.getWays().stream().filter(
+                        w -> "coastline".equals(w.get("natural"))).collect(Collectors.toList()),
+                null, COASTLINES, WRONGLY_ORDERED_WAYS);
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java
index 6c73700..4b1bb32 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java
@@ -8,6 +8,9 @@ import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -25,8 +28,45 @@ public class DuplicateNodeTest {
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
 
+    private static final DuplicateNode TEST = new DuplicateNode();
+
+    private static void doTest(int code, Tag ... tags) {
+        performTest(code, buildDataSet(tags), true);
+    }
+
+    private static void performTest(int code, DataSet ds, boolean fixable) {
+        TEST.startTest(NullProgressMonitor.INSTANCE);
+        TEST.visit(ds.allPrimitives());
+        TEST.endTest();
+
+        assertEquals(1, TEST.getErrors().size());
+        TestError error = TEST.getErrors().iterator().next();
+        assertEquals(code, error.getCode());
+        assertEquals(fixable, error.isFixable());
+    }
+
+    private static DataSet buildDataSet(Tag... tags) {
+        DataSet ds = new DataSet();
+
+        Node a = new Node(new LatLon(10.0, 5.0));
+        Node b = new Node(new LatLon(10.0, 5.0));
+        ds.addPrimitive(a);
+        ds.addPrimitive(b);
+
+        if (tags.length > 0) {
+            Way parent = new Way();
+            parent.addNode(a);
+            parent.addNode(b);
+            for (Tag tag : tags) {
+                parent.put(tag);
+            }
+            ds.addPrimitive(parent);
+        }
+        return ds;
+    }
+
     /**
-     * Test of "Duplicate node" validation test.
+     * Test of "Duplicate node" validation test - different tag sets.
      */
     @Test
     public void testDuplicateNode() {
@@ -37,11 +77,89 @@ public class DuplicateNodeTest {
         ds.addPrimitive(a);
         ds.addPrimitive(b);
 
-        DuplicateNode test = new DuplicateNode();
-        test.startTest(NullProgressMonitor.INSTANCE);
-        test.visit(ds.allPrimitives());
-        test.endTest();
+        a.put("foo", "bar");
+        b.put("bar", "foo");
+
+        performTest(DuplicateNode.DUPLICATE_NODE, ds, false);
+    }
 
-        assertEquals(1, test.getErrors().size());
+    /**
+     * Test of "Duplicate node" validation test - mixed case.
+     */
+    @Test
+    public void testDuplicateNodeMixed() {
+        doTest(DuplicateNode.DUPLICATE_NODE_MIXED, new Tag("building", "foo"), new Tag("highway", "bar"));
+    }
+
+    /**
+     * Test of "Duplicate node" validation test - other case.
+     */
+    @Test
+    public void testDuplicateNodeOther() {
+        doTest(DuplicateNode.DUPLICATE_NODE_OTHER);
+    }
+
+    /**
+     * Test of "Duplicate node" validation test - building case.
+     */
+    @Test
+    public void testDuplicateNodeBuilding() {
+        doTest(DuplicateNode.DUPLICATE_NODE_BUILDING, new Tag("building", "foo"));
+    }
+
+    /**
+     * Test of "Duplicate node" validation test - boundary case.
+     */
+    @Test
+    public void testDuplicateNodeBoundary() {
+        doTest(DuplicateNode.DUPLICATE_NODE_BOUNDARY, new Tag("boundary", "foo"));
+    }
+
+    /**
+     * Test of "Duplicate node" validation test - highway case.
+     */
+    @Test
+    public void testDuplicateNodeHighway() {
+        doTest(DuplicateNode.DUPLICATE_NODE_HIGHWAY, new Tag("highway", "foo"));
+    }
+
+    /**
+     * Test of "Duplicate node" validation test - landuse case.
+     */
+    @Test
+    public void testDuplicateNodeLanduse() {
+        doTest(DuplicateNode.DUPLICATE_NODE_LANDUSE, new Tag("landuse", "foo"));
+    }
+
+    /**
+     * Test of "Duplicate node" validation test - natural case.
+     */
+    @Test
+    public void testDuplicateNodeNatural() {
+        doTest(DuplicateNode.DUPLICATE_NODE_NATURAL, new Tag("natural", "foo"));
+    }
+
+    /**
+     * Test of "Duplicate node" validation test - power case.
+     */
+    @Test
+    public void testDuplicateNodePower() {
+        doTest(DuplicateNode.DUPLICATE_NODE_POWER, new Tag("power", "foo"));
+    }
+
+    /**
+     * Test of "Duplicate node" validation test - railway case.
+     */
+    @Test
+    public void testDuplicateNodeRailway() {
+        doTest(DuplicateNode.DUPLICATE_NODE_RAILWAY, new Tag("railway", "foo"));
+    }
+
+    /**
+     * Test of "Duplicate node" validation test - waterway case.
+     */
+    @Test
+    public void testDuplicateNodeWaterway() {
+        doTest(DuplicateNode.DUPLICATE_NODE_WATERWAY, new Tag("waterway", "foo"));
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
index 0c060af..1d18fbc 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
@@ -51,9 +51,13 @@ public class MapCSSTagCheckerTest {
         return test;
     }
 
+    /**
+     * Test {@code natural=marsh}.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testNaturalMarsh() throws Exception {
-        ParseResult result = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader("" +
+    public void testNaturalMarsh() throws ParseException {
+        ParseResult result = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader(
                 "*[natural=marsh] {\n" +
                 "   group: tr(\"deprecated\");\n" +
                 "   throwWarning: tr(\"{0}={1} is deprecated\", \"{0.key}\", tag(\"natural\"));\n" +
@@ -85,8 +89,12 @@ public class MapCSSTagCheckerTest {
                 MapCSSTagChecker.TagCheck.insertArguments(check.rule.selectors.get(0), "The key is {0.key} and the value is {0.value}", null));
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/10913">Bug #10913</a>.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testTicket10913() throws Exception {
+    public void testTicket10913() throws ParseException {
         final OsmPrimitive p = OsmUtils.createPrimitive("way highway=tertiary construction=yes");
         final TagCheck check = TagCheck.readMapCSS(new StringReader("way {" +
                 "throwError: \"error\";" +
@@ -100,8 +108,12 @@ public class MapCSSTagCheckerTest {
         assertTrue(it.next() instanceof ChangePropertyCommand);
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/9782">Bug #9782</a>.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testTicket9782() throws Exception {
+    public void testTicket9782() throws ParseException {
         final MapCSSTagChecker test = buildTagChecker("*[/.+_name/][!name] {" +
                 "throwWarning: tr(\"has {0} but not {1}\", \"{0.key}\", \"{1.key}\");}");
         final OsmPrimitive p = OsmUtils.createPrimitive("way alt_name=Foo");
@@ -111,8 +123,12 @@ public class MapCSSTagCheckerTest {
         assertEquals("3000_*[.+_name][!name]", errors.iterator().next().getIgnoreSubGroup());
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/10859">Bug #10859</a>.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testTicket10859() throws Exception {
+    public void testTicket10859() throws ParseException {
         final MapCSSTagChecker test = buildTagChecker("way[highway=footway][foot?!] {\n" +
                 "  throwWarning: tr(\"{0} used with {1}\", \"{0.value}\", \"{1.tag}\");}");
         final OsmPrimitive p = OsmUtils.createPrimitive("way highway=footway foot=no");
@@ -122,8 +138,20 @@ public class MapCSSTagCheckerTest {
         assertEquals("3000_way[highway=footway][foot]", errors.iterator().next().getIgnoreSubGroup());
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/13630">Bug #13630</a>.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testPreprocessing() throws Exception {
+    public void testTicket13630() throws ParseException {
+        ParseResult result = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader(
+                "node[crossing=zebra] {fixRemove: \"crossing=zebra\";}"));
+        assertTrue(result.parseChecks.isEmpty());
+        assertEquals(1, result.parseErrors.size());
+    }
+
+    @Test
+    public void testPreprocessing() throws ParseException {
         final MapCSSTagChecker test = buildTagChecker("" +
                 "@supports (min-josm-version: 1) { *[foo] { throwWarning: \"!\"; } }\n" +
                 "@supports (min-josm-version: 2147483647) { *[bar] { throwWarning: \"!\"; } }\n");
@@ -145,4 +173,17 @@ public class MapCSSTagCheckerTest {
         }
         assertTrue("not all assertions included in the tests are met", assertionErrors.isEmpty());
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/13762">Bug #13762</a>.
+     * @throws ParseException if a parsing error occurs
+     */
+    @Test
+    public void testTicket13762() throws ParseException {
+        final ParseResult parseResult = TagCheck.readMapCSS(new StringReader("" +
+                "meta[lang=de] {\n" +
+                "    title: \"Deutschlandspezifische Regeln\";" +
+                "}"));
+        assertTrue(parseResult.parseErrors.isEmpty());
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
index 63ba4e0..0a7d91a 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
@@ -4,15 +4,10 @@ package org.openstreetmap.josm.data.validation.tests;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -21,10 +16,7 @@ import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -89,38 +81,8 @@ public class MultipolygonTestTest {
      */
     @Test
     public void testMultipolygonFile() throws Exception {
-        try (InputStream is = new FileInputStream("data_nodist/multipolygon.osm")) {
-            for (Relation r : OsmReader.parseDataSet(is, null).getRelations()) {
-                if (r.isMultipolygon()) {
-                    String name = DefaultNameFormatter.getInstance().format(r);
-                    String codes = r.get("josm_error_codes");
-                    if (codes != null) {
-                        List<TestError> errors = new ArrayList<>();
-                        for (org.openstreetmap.josm.data.validation.Test test : Arrays.asList(MULTIPOLYGON_TEST, RELATION_TEST)) {
-                            test.initialize();
-                            test.startTest(null);
-                            test.visit(r);
-                            test.endTest();
-                            errors.addAll(test.getErrors());
-                        }
-                        Set<Integer> expectedCodes = new TreeSet<>();
-                        for (String code : codes.split(",")) {
-                            expectedCodes.add(Integer.parseInt(code));
-                        }
-                        Set<Integer> actualCodes = new TreeSet<>();
-                        for (TestError error : errors) {
-                            Integer code = error.getCode();
-                            assertTrue(name + " does not expect JOSM error code " + code + ": " + error.getDescription(),
-                                    expectedCodes.contains(code));
-                            actualCodes.add(code);
-                        }
-                        assertEquals(name + " " + expectedCodes + " => " + actualCodes,
-                                expectedCodes.size(), actualCodes.size());
-                    } else if (r.hasKey("name") && (r.getName().startsWith("06") || r.getName().startsWith("07"))) {
-                        fail(name + " lacks josm_error_codes tag");
-                    }
-                }
-            }
-        }
+        ValidatorTestUtils.testSampleFile("data_nodist/multipolygon.osm",
+                ds -> ds.getRelations().stream().filter(Relation::isMultipolygon).collect(Collectors.toList()),
+                name -> name.startsWith("06") || name.startsWith("07"), MULTIPOLYGON_TEST, RELATION_TEST);
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java
index f611564..2c2cc4e 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java
@@ -76,4 +76,13 @@ public class NameMismatchTest {
         errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia name:de=Italien name:en=Italy");
         assertEquals(0, errors.size());
     }
+
+    /**
+     * Test that {@code name:etymology:wikidata} does not count.
+     */
+    @Test
+    public void testEtymologyWikidata() {
+        final List<TestError> errors = test("node name=Foo name:etymology:wikidata=Bar");
+        assertEquals(0, errors.size());
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWayTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWayTest.java
new file mode 100644
index 0000000..3e24681
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWayTest.java
@@ -0,0 +1,132 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Way;
+
+/**
+ * JUnit Test of Multipolygon validation test.
+ */
+public class SelfIntersectingWayTest {
+
+    /**
+     * Setup test.
+     * @throws Exception if test cannot be initialized
+     */
+    @BeforeClass
+    public static void setUp() throws Exception {
+        JOSMFixture.createUnitTestFixture().init(true);
+    }
+
+    private static List<Node> createNodes() {
+        List<Node> nodes = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            nodes.add(new Node(i+1));
+        }
+        nodes.get(0).setCoor(new LatLon(34.2680878298, 133.56336369008));
+        nodes.get(1).setCoor(new LatLon(34.25096598132, 133.54891792012));
+        nodes.get(2).setCoor(new LatLon(34.24466741332, 133.56693544639));
+        nodes.get(3).setCoor(new LatLon(34.26815342405, 133.56066502976));
+        nodes.get(4).setCoor(new LatLon(34.26567411471, 133.56132705125));
+        return nodes;
+    }
+
+    /**
+     * Self-Intersection at inner node (not first / last).
+     */
+    @Test
+    public void testUnclosedWayNormal() {
+        List<Node> nodes = createNodes();
+
+        Way w = (Way) OsmUtils.createPrimitive("way ");
+        List<Node> wayNodes = new ArrayList<>();
+        wayNodes.add(nodes.get(0));
+        wayNodes.add(nodes.get(1));
+        wayNodes.add(nodes.get(2));
+        wayNodes.add(nodes.get(1)); // problem
+        wayNodes.add(nodes.get(3));
+        wayNodes.add(nodes.get(4));
+        w.setNodes(wayNodes);
+        SelfIntersectingWay test = new SelfIntersectingWay();
+        test.visit(w);
+        Assert.assertEquals(1, test.getErrors().size());
+        Assert.assertTrue(test.getErrors().iterator().next().getHighlighted().contains(nodes.get(1)));
+    }
+
+    /**
+     * First node is identical to an inner node ("P"-Shape).
+     * This is considered okay.
+     */
+    @Test
+    public void testUnclosedWayFirst() {
+        List<Node> nodes = createNodes();
+
+        Way w = (Way) OsmUtils.createPrimitive("way ");
+        List<Node> wayNodes = new ArrayList<>();
+        wayNodes.add(nodes.get(0));
+        wayNodes.add(nodes.get(1));
+        wayNodes.add(nodes.get(2));
+        wayNodes.add(nodes.get(0)); // problem
+        wayNodes.add(nodes.get(3));
+        wayNodes.add(nodes.get(4));
+        w.setNodes(wayNodes);
+        SelfIntersectingWay test = new SelfIntersectingWay();
+        test.visit(w);
+        Assert.assertEquals(0, test.getErrors().size());
+    }
+
+    /**
+     * Last node is identical to an inner node ("b"-Shape).
+     * This is considered okay.
+     */
+    @Test
+    public void testUnclosedWayLast() {
+        List<Node> nodes = createNodes();
+
+        Way w = (Way) OsmUtils.createPrimitive("way ");
+        List<Node> wayNodes = new ArrayList<>();
+        wayNodes.add(nodes.get(0));
+        wayNodes.add(nodes.get(1)); // problem node
+        wayNodes.add(nodes.get(2));
+        wayNodes.add(nodes.get(3));
+        wayNodes.add(nodes.get(4));
+        wayNodes.add(nodes.get(1));
+        w.setNodes(wayNodes);
+        SelfIntersectingWay test = new SelfIntersectingWay();
+        test.visit(w);
+        Assert.assertEquals(0, test.getErrors().size());
+    }
+
+    /**
+     * Both endpoints join at one inner node ("8"-shape).
+     * This is considered okay.
+     */
+    @Test
+    public void testClosedWay() {
+        List<Node> nodes = createNodes();
+
+        Way w = (Way) OsmUtils.createPrimitive("way ");
+        List<Node> wayNodes = new ArrayList<>();
+        wayNodes.add(nodes.get(0));
+        wayNodes.add(nodes.get(1));
+        wayNodes.add(nodes.get(2));
+        wayNodes.add(nodes.get(0)); // problem
+        wayNodes.add(nodes.get(3));
+        wayNodes.add(nodes.get(4));
+        wayNodes.add(nodes.get(0));
+        w.setNodes(wayNodes);
+        SelfIntersectingWay test = new SelfIntersectingWay();
+        test.visit(w);
+        Assert.assertEquals(0, test.getErrors().size());
+    }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java b/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java
new file mode 100644
index 0000000..03528fb
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java
@@ -0,0 +1,71 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.validation.Test;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.io.OsmReader;
+
+/**
+ * Utilities for validator unit tests.
+ */
+public final class ValidatorTestUtils {
+
+    private ValidatorTestUtils() {
+        // Hide default constructor for utilities classes
+    }
+
+    static <T extends OsmPrimitive> void testSampleFile(String sampleFile,
+            Function<DataSet, Iterable<T>> provider, Predicate<String> namePredicate,
+            Test ... tests) throws Exception {
+        try (InputStream is = new FileInputStream(sampleFile)) {
+            for (T t: provider.apply(OsmReader.parseDataSet(is, null))) {
+                String name = DefaultNameFormatter.getInstance().format(t);
+                String codes = t.get("josm_error_codes");
+                if (codes != null) {
+                    List<TestError> errors = new ArrayList<>();
+                    for (Test test : tests) {
+                        test.initialize();
+                        test.startTest(null);
+                        test.visit(Collections.singleton(t));
+                        test.endTest();
+                        errors.addAll(test.getErrors());
+                    }
+                    Set<Integer> expectedCodes = new TreeSet<>();
+                    if (!"none".equals(codes)) {
+                        for (String code : codes.split(",")) {
+                            expectedCodes.add(Integer.parseInt(code));
+                        }
+                    }
+                    Set<Integer> actualCodes = new TreeSet<>();
+                    for (TestError error : errors) {
+                        Integer code = error.getCode();
+                        assertTrue(name + " does not expect JOSM error code " + code + ": " + error.getDescription(),
+                                expectedCodes.contains(code));
+                        actualCodes.add(code);
+                    }
+                    assertEquals(name + " " + expectedCodes + " => " + actualCodes,
+                            expectedCodes.size(), actualCodes.size());
+                } else if (t.hasKey("name") && namePredicate != null && namePredicate.test(t.getName())) {
+                    fail(name + " lacks josm_error_codes tag");
+                }
+            }
+        }
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java b/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
index 1834362..5ba61ae 100644
--- a/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
@@ -5,6 +5,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -14,6 +17,7 @@ import javax.swing.event.ChangeListener;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginHandlerTestIT;
@@ -34,6 +38,43 @@ public class MainApplicationTest {
         JOSMFixture.createUnitTestFixture().init(true);
     }
 
+    private void testShow(final String arg, String expected) throws InterruptedException, IOException {
+        PrintStream old = System.out;
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            System.setOut(new PrintStream(baos));
+            Thread t = new Thread() {
+                @Override
+                public void run() {
+                    MainApplication.main(new String[] {arg});
+                }
+            };
+            t.run();
+            t.join();
+            System.out.flush();
+            assertEquals(expected, baos.toString().trim());
+        } finally {
+            System.setOut(old);
+        }
+    }
+
+    /**
+     * Test of {@link MainApplication#main} with argument {@code --version}.
+     * @throws Exception in case of error
+     */
+    @Test
+    public void testShowVersion() throws Exception {
+        testShow("--version", Version.getInstance().getAgentString());
+    }
+
+    /**
+     * Test of {@link MainApplication#main} with argument {@code --help}.
+     * @throws Exception in case of error
+     */
+    @Test
+    public void testShowHelp() throws Exception {
+        testShow("--help", MainApplication.getHelp().trim());
+    }
+
     /**
      * Test of {@link MainApplication#updateAndLoadEarlyPlugins} and {@link MainApplication#loadLatePlugins} methods.
      * @throws PluginListParseException if an error occurs
@@ -71,7 +112,6 @@ public class MainApplicationTest {
     }
 
     private static PluginInformation newPluginInformation(String plugin) throws PluginListParseException {
-        //return new PluginInformation(new File(TestUtils.getTestDataRoot()+File.separator+"plugin"+File.separator+plugin+".jar"));
         return PluginListParser.createInfo(plugin+".jar", "https://svn.openstreetmap.org/applications/editors/josm/dist/"+plugin+".jar",
                 "");
     }
diff --git a/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java b/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java
new file mode 100644
index 0000000..c0929e9
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java
@@ -0,0 +1,30 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Test {@link MapStatus}
+ */
+public class MapStatusTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Unit test of methods {@link MapStatus.StatusTextHistory#equals} and {@link MapStatus.StatusTextHistory#hashCode}.
+     */
+    @Test
+    public void testEqualsContract() {
+        EqualsVerifier.forClass(MapStatus.StatusTextHistory.class).withIgnoredFields("text").verify();
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/conflict/pair/ConflictResolverTest.java b/test/unit/org/openstreetmap/josm/gui/conflict/pair/ConflictResolverTest.java
new file mode 100644
index 0000000..595bc07
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/conflict/pair/ConflictResolverTest.java
@@ -0,0 +1,83 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.conflict.pair;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link ConflictResolver} class.
+ */
+public class ConflictResolverTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Unit test of {@link ConflictResolver#buildResolveCommand} - empty case.
+     */
+    @Test
+    public void testBuildResolveCommandEmpty() {
+        assertNotNull(new ConflictResolver().buildResolveCommand());
+    }
+
+    /**
+     * Unit test of {@link ConflictResolver#buildResolveCommand} - node case.
+     */
+    @Test
+    public void testBuildResolveCommandNode() {
+        ConflictResolver resolver = new ConflictResolver();
+        Node n1 = new Node(LatLon.SOUTH_POLE);
+        n1.put("source", "my");
+        Node n2 = new Node(LatLon.NORTH_POLE);
+        n2.put("source", "theirs");
+        resolver.populate(new Conflict<>(n1, n2));
+        resolver.decideRemaining(MergeDecisionType.KEEP_MINE);
+        assertFalse(((SequenceCommand) resolver.buildResolveCommand()).getChildren().isEmpty());
+    }
+
+    /**
+     * Unit test of {@link ConflictResolver#buildResolveCommand} - way case.
+     */
+    @Test
+    public void testBuildResolveCommandWay() {
+        ConflictResolver resolver = new ConflictResolver();
+        Way w1 = new Way();
+        w1.put("source", "my");
+        Way w2 = new Way();
+        w2.put("source", "theirs");
+        resolver.populate(new Conflict<>(w1, w2));
+        resolver.decideRemaining(MergeDecisionType.KEEP_MINE);
+        assertFalse(((SequenceCommand) resolver.buildResolveCommand()).getChildren().isEmpty());
+    }
+
+    /**
+     * Unit test of {@link ConflictResolver#buildResolveCommand} - relation case.
+     */
+    @Test
+    public void testBuildResolveCommandRelation() {
+        ConflictResolver resolver = new ConflictResolver();
+        Relation r1 = new Relation();
+        r1.put("source", "my");
+        Relation r2 = new Relation();
+        r2.put("source", "theirs");
+        resolver.populate(new Conflict<>(r1, r2));
+        resolver.decideRemaining(MergeDecisionType.KEEP_MINE);
+        assertFalse(((SequenceCommand) resolver.buildResolveCommand()).getChildren().isEmpty());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java
new file mode 100644
index 0000000..2204456
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java
@@ -0,0 +1,71 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link CommandStackDialog} class.
+ */
+public class CommandStackDialogTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().commands();
+
+    /**
+     * Unit test of {@link CommandStackDialog} class - empty case.
+     */
+    @Test
+    public void testCommandStackDialogEmpty() {
+        CommandStackDialog dlg = new CommandStackDialog();
+        dlg.showDialog();
+        assertTrue(dlg.isVisible());
+        dlg.hideDialog();
+        assertFalse(dlg.isVisible());
+    }
+
+    /**
+     * Unit test of {@link CommandStackDialog} class - not empty case.
+     */
+    @Test
+    public void testCommandStackDialogNotEmpty() {
+        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
+        Main.getLayerManager().addLayer(layer);
+        try {
+            Command cmd1 = TestUtils.newCommand();
+            Command cmd2 = TestUtils.newCommand();
+            Main.main.undoRedo.add(cmd1);
+            Main.main.undoRedo.add(cmd2);
+            Main.main.undoRedo.undo(1);
+
+            assertFalse(Main.main.undoRedo.commands.isEmpty());
+            assertFalse(Main.main.undoRedo.redoCommands.isEmpty());
+
+            CommandStackDialog dlg = new CommandStackDialog();
+            Main.map.addToggleDialog(dlg);
+            dlg.unfurlDialog();
+            assertTrue(dlg.isVisible());
+            Main.map.removeToggleDialog(dlg);
+            dlg.hideDialog();
+            assertFalse(dlg.isVisible());
+        } finally {
+            Main.main.undoRedo.clean();
+            Main.getLayerManager().removeLayer(layer);
+        }
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java
index a84d779..5521aa9 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java
@@ -123,7 +123,7 @@ public class InspectPrimitiveDialogTest {
             n.setUser(User.getAnonymous());
             ds.addPrimitive(n);
             ds.addSelected(n);
-            assertEquals(baseText + baseText + "Warning: The 2 selected objects have equal, but not identical style caches.",
+            assertEquals(baseText + baseText + "The 2 selected objects have identical style caches.",
                     InspectPrimitiveDialog.buildMapPaintText().replaceAll("@(\\p{XDigit})+", ""));
         } finally {
             Main.getLayerManager().removeLayer(layer);
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java
deleted file mode 100644
index c00b4c9..0000000
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.openstreetmap.josm.data.coor.LatLon;
-
-/**
- * Unit tests of {@link LatLonDialog} class.
- */
-public class LatLonDialogTest {
-
-    /**
-     * Unit test of {@link LatLonDialog#parseLatLon} method.
-     */
-    @Test
-    public void testParseLatLon() {
-        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("49.29918° 19.24788°"));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("N 49.29918 E 19.24788°"));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("49.29918° 19.24788°"));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("N 49.29918 E 19.24788"));
-        assertEquals(new LatLon(-19 - 24.788 / 60, -49 - 29.918 / 60), LatLonDialog.parseLatLon("W 49°29.918' S 19°24.788'"));
-        assertEquals(new LatLon(49 + 29. / 60 + 04. / 3600, 19 + 24. / 60 + 43. / 3600), LatLonDialog.parseLatLon("N 49°29'04\" E 19°24'43\""));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("49.29918 N, 19.24788 E"));
-        assertEquals(new LatLon(49 + 29. / 60 + 21. / 3600, 19 + 24. / 60 + 38. / 3600), LatLonDialog.parseLatLon("49°29'21\" N 19°24'38\" E"));
-        assertEquals(new LatLon(49 + 29. / 60 + 51. / 3600, 19 + 24. / 60 + 18. / 3600), LatLonDialog.parseLatLon("49 29 51, 19 24 18"));
-        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLonDialog.parseLatLon("49 29, 19 24"));
-        assertEquals(new LatLon(19 + 24. / 60, 49 + 29. / 60), LatLonDialog.parseLatLon("E 49 29, N 19 24"));
-        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLonDialog.parseLatLon("49° 29; 19° 24"));
-        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLonDialog.parseLatLon("49° 29; 19° 24"));
-        assertEquals(new LatLon(49 + 29. / 60, -19 - 24. / 60), LatLonDialog.parseLatLon("N 49° 29, W 19° 24"));
-        assertEquals(new LatLon(-49 - 29.5 / 60, 19 + 24.6 / 60), LatLonDialog.parseLatLon("49° 29.5 S, 19° 24.6 E"));
-        assertEquals(new LatLon(49 + 29.918 / 60, 19 + 15.88 / 60), LatLonDialog.parseLatLon("N 49 29.918 E 19 15.88"));
-        assertEquals(new LatLon(49 + 29.4 / 60, 19 + 24.5 / 60), LatLonDialog.parseLatLon("49 29.4 19 24.5"));
-        assertEquals(new LatLon(-49 - 29.4 / 60, 19 + 24.5 / 60), LatLonDialog.parseLatLon("-49 29.4 N -19 24.5 W"));
-    }
-}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java
new file mode 100644
index 0000000..f3ebc4a
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java
@@ -0,0 +1,36 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link MinimapDialog} class.
+ */
+public class MinimapDialogTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().commands();
+
+    /**
+     * Unit test of {@link MinimapDialog} class.
+     */
+    @Test
+    public void testMinimapDialog() {
+        MinimapDialog dlg = new MinimapDialog();
+        dlg.showDialog();
+        assertTrue(dlg.isVisible());
+        dlg.hideDialog();
+        assertFalse(dlg.isVisible());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModelTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModelTest.java
new file mode 100644
index 0000000..d7487e1
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModelTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link ChangesetCacheTableColumnModel} class.
+ */
+public class ChangesetCacheTableColumnModelTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Unit test of {@link ChangesetCacheTableColumnModel}.
+     */
+    @Test
+    public void testChangesetCacheTableColumnModel() {
+        assertNotNull(new ChangesetCacheTableColumnModel());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java
index bb62fb1..e06284d 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java
@@ -33,7 +33,7 @@ public class PropertiesDialogTest {
 
     private static String createSearchSetting(DataSet ds, boolean sameType) {
         List<OsmPrimitive> sel = new ArrayList<>(ds.allPrimitives());
-        Collections.sort(sel, new OsmPrimitiveComparator(true, false));
+        Collections.sort(sel, OsmPrimitiveComparator.comparingUniqueId());
         return PropertiesDialog.createSearchSetting("foo", sel, sameType).text;
     }
 
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanelTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanelTest.java
index 3cff7a6..4bd9253 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanelTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanelTest.java
@@ -8,6 +8,7 @@ import static org.junit.Assert.assertNull;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -41,14 +42,35 @@ public class ValidatorTreePanelTest {
         assertNotNull(new ValidatorTreePanel());
 
         ValidatorTreePanel vtp = new ValidatorTreePanel(new ArrayList<>(Arrays.asList(
-                new TestError(null, Severity.ERROR, "err", 0, new Node(1)),
-                new TestError(null, Severity.WARNING, "warn", 0, new Node(2)))));
+                TestError.builder(null, Severity.ERROR, 0)
+                        .message("err")
+                        .primitives(new Node(1))
+                        .build(),
+                TestError.builder(null, Severity.WARNING, 0)
+                        .message("warn", "foo")
+                        .primitives(new Node(2))
+                        .build(),
+                TestError.builder(null, Severity.WARNING, 0)
+                        .message("warn", "bar")
+                        .primitives(new Node(2))
+                        .build())));
         assertNotNull(vtp);
-        assertEquals(2, vtp.getErrors().size());
+        final Enumeration<?> nodes = vtp.getRoot().breadthFirstEnumeration();
+        assertEquals("", nodes.nextElement().toString());
+        assertEquals("Errors (1)", nodes.nextElement().toString());
+        assertEquals("Warnings (2)", nodes.nextElement().toString());
+        assertEquals("err (1)", nodes.nextElement().toString());
+        assertEquals("warn (2)", nodes.nextElement().toString());
+        nodes.nextElement();
+        assertEquals("bar (1)", nodes.nextElement().toString());
+        assertEquals("foo (1)", nodes.nextElement().toString());
         vtp.setVisible(true);
         vtp.setVisible(false);
         Node n = new Node(10);
-        vtp.setErrors(Arrays.asList(new TestError(null, Severity.ERROR, "", 0, n)));
+        vtp.setErrors(Arrays.asList(TestError.builder(null, Severity.ERROR, 0)
+                .message("")
+                .primitives(n)
+                .build()));
         assertEquals(1, vtp.getErrors().size());
         vtp.selectRelatedErrors(Collections.<OsmPrimitive>singleton(n));
         vtp.expandAll();
diff --git a/test/unit/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTaskTest.java b/test/unit/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTaskTest.java
new file mode 100644
index 0000000..3de5f89
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTaskTest.java
@@ -0,0 +1,47 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.io;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import javax.swing.JPanel;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link DownloadOpenChangesetsTask} class.
+ */
+public class DownloadOpenChangesetsTaskTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().devAPI();
+
+    /**
+     * Test of {@link DownloadOpenChangesetsTask} class.
+     */
+    @Test
+    public void testDownloadOpenChangesetsTask() {
+        DownloadOpenChangesetsTask task = new DownloadOpenChangesetsTask(new JPanel());
+        assertNull(task.getChangesets());
+
+        assertTrue(JosmUserIdentityManager.getInstance().isAnonymous());
+        task.run();
+        assertNull(task.getChangesets());
+
+        task = new DownloadOpenChangesetsTask(new JPanel());
+        JosmUserIdentityManager.getInstance().setPartiallyIdentified(System.getProperty("osm.username", "josm_test"));
+        assertTrue(JosmUserIdentityManager.getInstance().isPartiallyIdentified());
+        task.run();
+        assertNotNull(task.getChangesets());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/io/DownloadPrimitivesTaskTest.java b/test/unit/org/openstreetmap/josm/gui/io/DownloadPrimitivesTaskTest.java
new file mode 100644
index 0000000..fb41fe3
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/io/DownloadPrimitivesTaskTest.java
@@ -0,0 +1,44 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.io;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link DownloadPrimitivesTask} class.
+ */
+public class DownloadPrimitivesTaskTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().devAPI();
+
+    /**
+     * Test of {@link DownloadPrimitivesTask} class.
+     */
+    @Test
+    public void testDownloadPrimitivesTask() {
+        DataSet ds = new DataSet();
+        assertTrue(ds.allPrimitives().isEmpty());
+        SimplePrimitiveId pid = new SimplePrimitiveId(1, OsmPrimitiveType.NODE);
+        new DownloadPrimitivesTask(new OsmDataLayer(ds, "", null), Arrays.asList(pid), true).run();
+        assertFalse(ds.allPrimitives().isEmpty());
+        assertNotNull(ds.getPrimitiveById(pid));
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
index b151773..0ec8804 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
@@ -82,7 +82,6 @@ public class GpxLayerTest {
         assertEquals(Color.MAGENTA, layer2.getColorProperty().get());
         assertEquals("<html>0 tracks, 0 routes, 0 waypoints<br>Length: < 0.01 m<br></html>", layer2.getToolTipText());
 
-        assertFalse(layer.isChanged());
         assertTrue(layer.checkSaveConditions());
         assertTrue(layer.isInfoResizable());
         assertTrue(layer.isSavable());
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java
index a975789..73a58b4 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java
@@ -16,6 +16,7 @@ import java.awt.Graphics2D;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 
 import javax.swing.Action;
 import javax.swing.Icon;
@@ -40,7 +41,6 @@ import org.openstreetmap.josm.tools.bugreport.ReportedException;
  *
  */
 public class LayerManagerTest {
-
     /**
      * This is a layer that can be used in tests. It does not do anything and provides a simple, fake implementation.
      * @author Michael Zangl
@@ -119,9 +119,9 @@ public class LayerManagerTest {
      *
      */
     protected class CapturingLayerChangeListener implements LayerChangeListener {
-        private LayerAddEvent layerAdded;
-        private LayerRemoveEvent layerRemoved;
-        private LayerOrderChangeEvent layerOrderChanged;
+        protected LayerAddEvent layerAdded;
+        protected LayerRemoveEvent layerRemoved;
+        protected LayerOrderChangeEvent layerOrderChanged;
 
         @Override
         public void layerAdded(LayerAddEvent e) {
@@ -148,6 +148,16 @@ public class LayerManagerTest {
         }
     }
 
+    private final class ResetStateChangeListener extends CapturingLayerChangeListener {
+        int removed = 0;
+
+        @Override
+        public void layerRemoving(LayerRemoveEvent e) {
+            // count only
+            removed++;
+        }
+    }
+
     protected LayerManager layerManager;
 
     /**
@@ -472,4 +482,58 @@ public class LayerManagerTest {
         assertEquals(Arrays.asList(layer1, layer2), fired);
     }
 
+    /**
+     * Test {@link LayerRemoveEvent#scheduleRemoval(java.util.Collection)}
+     */
+    @Test
+    public void testLayerRemoveScheduleRemoval() {
+        TestLayer layer1 = new TestLayer();
+        TestLayer layer2 = new TestLayer();
+        layerManager.addLayer(layer1);
+        layerManager.addLayer(layer2);
+
+        layerManager.addLayerChangeListener(new LayerChangeListener() {
+            @Override
+            public void layerRemoving(LayerRemoveEvent e) {
+                    if (e.getRemovedLayer() == layer1) {
+                        e.scheduleRemoval(Collections.singleton(layer2));
+                    }
+            }
+
+            @Override
+            public void layerOrderChanged(LayerOrderChangeEvent e) {
+                fail();
+            }
+
+            @Override
+            public void layerAdded(LayerAddEvent e) {
+                fail();
+            }
+        });
+
+        layerManager.removeLayer(layer1);
+        assertEquals(0, layerManager.getLayers().size());
+    }
+
+    /**
+     * Test {@link LayerManager#resetState()}
+     */
+    @Test
+    public void testResetState() {
+        ResetStateChangeListener changeListener = new ResetStateChangeListener();
+        layerManager.addLayer(new TestLayer());
+        layerManager.addLayerChangeListener(changeListener);
+        layerManager.addLayer(new TestLayer());
+        assertEquals(2, layerManager.getLayers().size());
+        assertNotNull(changeListener.layerAdded);
+
+        layerManager.resetState();
+        changeListener.layerAdded = null;
+
+        assertEquals(2, changeListener.removed);
+        assertEquals(0, layerManager.getLayers().size());
+        layerManager.addLayer(new TestLayer());
+        assertNull(changeListener.layerAdded);
+    }
+
 }
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/LayerPositionStrategyTest.java b/test/unit/org/openstreetmap/josm/gui/layer/LayerPositionStrategyTest.java
new file mode 100644
index 0000000..3f39ddb
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/layer/LayerPositionStrategyTest.java
@@ -0,0 +1,21 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Test the {@link LayerPositionStrategy} class.
+ */
+public class LayerPositionStrategyTest {
+
+    /**
+     * Test of robustness against null manager.
+     */
+    @Test
+    public void testNullManager() {
+        assertEquals(0, LayerPositionStrategy.inFrontOfFirst(l -> true).getPosition(null));
+        assertEquals(0, LayerPositionStrategy.afterLast(l -> true).getPosition(null));
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
index bc8c1d5..52c5618 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
@@ -253,4 +253,12 @@ public class OsmDataLayerTest {
         fillDataSet(ds);
         assertTrue(layer.checkSaveConditions());
     }
+
+    @Test
+    public void testLayerNameIncreases() throws Exception {
+        final OsmDataLayer layer1 = new OsmDataLayer(new DataSet(), OsmDataLayer.createLayerName(147), null);
+        final OsmDataLayer layer2 = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
+        assertEquals("Data Layer 147", layer1.getName());
+        assertEquals("Data Layer 148", layer2.getName());
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java
index 5578934..ab88b5d 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java
@@ -37,4 +37,12 @@ public class WMSLayerTest {
             Main.getLayerManager().removeLayer(wms);
         }
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/13828">Bug #13828</a>.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testTicket13828() {
+        new WMSLayer(new ImageryInfo("TMS", "http://203.159.29.217/try2/{z}/{x}/{y}.png"));
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java b/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java
new file mode 100644
index 0000000..d6aeb3b
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java
@@ -0,0 +1,42 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.gpx;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.TagMap;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.io.GpxReaderTest;
+
+/**
+ * Unit tests of {@link ConvertToDataLayerAction} class.
+ */
+public class ConvertToDataLayerActionTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init(false);
+    }
+
+    /**
+     * Tests a conversion from a GPX marker layer to a OSM dataset
+     * @throws Exception if the parsing fails
+     */
+    @Test
+    public void testFromMarkerLayer() throws Exception {
+        final GpxData data = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "minimal.gpx");
+        final MarkerLayer markers = new MarkerLayer(data, "Markers", data.storageFile, null);
+        final DataSet osm = new ConvertToDataLayerAction.FromMarkerLayer(markers).convert();
+        assertEquals(1, osm.getNodes().size());
+        assertEquals(new TagMap("name", "Schranke", "description", "Pfad", "note", "Pfad", "gpxicon", "Toll Booth"),
+                osm.getNodes().iterator().next().getKeys());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBoxTest.java b/test/unit/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBoxTest.java
new file mode 100644
index 0000000..8bdc3ae
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBoxTest.java
@@ -0,0 +1,37 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.oauth;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.swing.ListCellRenderer;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link AuthorizationProcedureComboBox} class.
+ */
+public class AuthorizationProcedureComboBoxTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Unit test of {@link AuthorizationProcedureComboBox}.
+     */
+    @Test
+    public void testAuthorizationProcedureComboBox() {
+        ListCellRenderer<? super AuthorizationProcedure> r = new AuthorizationProcedureComboBox().getRenderer();
+        for (AuthorizationProcedure procedure : AuthorizationProcedure.values()) {
+            assertEquals(r, r.getListCellRendererComponent(null, procedure, 0, true, false));
+            assertEquals(r, r.getListCellRendererComponent(null, procedure, 0, false, false));
+        }
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUITest.java b/test/unit/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUITest.java
index 88e619c..b9bef99 100644
--- a/test/unit/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUITest.java
+++ b/test/unit/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUITest.java
@@ -3,10 +3,12 @@ package org.openstreetmap.josm.gui.oauth;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link FullyAutomaticAuthorizationUI} class.
@@ -16,10 +18,9 @@ public class FullyAutomaticAuthorizationUITest {
     /**
      * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
 
     /**
      * Unit test of {@link FullyAutomaticAuthorizationUI#FullyAutomaticAuthorizationUI}.
diff --git a/test/unit/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanelTest.java b/test/unit/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanelTest.java
new file mode 100644
index 0000000..98ebdc8
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanelTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.oauth;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link FullyAutomaticPropertiesPanel} class.
+ */
+public class FullyAutomaticPropertiesPanelTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Unit test of {@link FullyAutomaticPropertiesPanel#FullyAutomaticPropertiesPanel}.
+     */
+    @Test
+    public void testFullyAutomaticPropertiesPanel() {
+        assertTrue(new FullyAutomaticPropertiesPanel().getComponentCount() > 0);
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUITest.java b/test/unit/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUITest.java
index 8f604f6..bdd618a 100644
--- a/test/unit/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUITest.java
+++ b/test/unit/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUITest.java
@@ -3,10 +3,12 @@ package org.openstreetmap.josm.gui.oauth;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link ManualAuthorizationUI} class.
@@ -16,10 +18,9 @@ public class ManualAuthorizationUITest {
     /**
      * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
 
     /**
      * Unit test of {@link ManualAuthorizationUI#ManualAuthorizationUI}.
diff --git a/test/unit/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClientTest.java b/test/unit/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClientTest.java
index a08e027..d675287 100644
--- a/test/unit/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClientTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClientTest.java
@@ -10,12 +10,14 @@ import java.net.URI;
 import java.net.URL;
 import java.util.Collections;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link OsmOAuthAuthorizationClient} class.
@@ -25,10 +27,9 @@ public class OsmOAuthAuthorizationClientTest {
     /**
      * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
 
     /**
      * Unit test of {@link OsmOAuthAuthorizationClient}.
diff --git a/test/unit/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUITest.java b/test/unit/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUITest.java
index ecaed95..ad2dc08 100644
--- a/test/unit/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUITest.java
+++ b/test/unit/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUITest.java
@@ -3,10 +3,12 @@ package org.openstreetmap.josm.gui.oauth;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link SemiAutomaticAuthorizationUI} class.
@@ -16,10 +18,9 @@ public class SemiAutomaticAuthorizationUITest {
     /**
      * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
 
     /**
      * Unit test of {@link SemiAutomaticAuthorizationUI#SemiAutomaticAuthorizationUI}.
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanelTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanelTest.java
new file mode 100644
index 0000000..33aa9f1
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanelTest.java
@@ -0,0 +1,34 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.preferences.imagery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link AddTMSLayerPanel} class.
+ */
+public class AddTMSLayerPanelTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Unit test of {@link AddTMSLayerPanel}.
+     */
+    @Test
+    public void testAddTMSLayerPanel() {
+        AddTMSLayerPanel panel = new AddTMSLayerPanel();
+        assertEquals("", panel.getImageryInfo().getUrl());
+        assertFalse(panel.isImageryValid());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanelTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanelTest.java
new file mode 100644
index 0000000..dd0cc49
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanelTest.java
@@ -0,0 +1,34 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.preferences.imagery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link AddWMSLayerPanel} class.
+ */
+public class AddWMSLayerPanelTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Unit test of {@link AddWMSLayerPanel}.
+     */
+    @Test
+    public void testAddWMSLayerPanel() {
+        AddWMSLayerPanel panel = new AddWMSLayerPanel();
+        assertEquals("", panel.getImageryInfo().getUrl());
+        assertFalse(panel.isImageryValid());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanelTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanelTest.java
new file mode 100644
index 0000000..69a6226
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanelTest.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.preferences.imagery;
+
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link AddWMTSLayerPanel} class.
+ */
+public class AddWMTSLayerPanelTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Unit test of {@link AddWMTSLayerPanel}.
+     */
+    @Test
+    public void testAddWMTSLayerPanel() {
+        AddWMTSLayerPanel panel = new AddWMTSLayerPanel();
+        assertFalse(panel.isImageryValid());
+    }
+
+    /**
+     * Unit test of {@link AddWMTSLayerPanel#getImageryInfo}.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetImageryInfo() {
+        new AddWMTSLayerPanel().getImageryInfo();
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java
index ad2ca85..69e0fec 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java
@@ -3,10 +3,12 @@ package org.openstreetmap.josm.gui.preferences.imagery;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link ImageryPreference} class.
@@ -14,12 +16,11 @@ import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
 public class ImageryPreferenceTest {
 
     /**
-     * Setup test.
+     * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform().commands();
 
     /**
      * Unit test of {@link ImageryPreference#ImageryPreference}.
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java b/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java
index c8b7484..b01fa27 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java
@@ -23,6 +23,7 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.AssignmentInstruct
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -52,6 +53,7 @@ public class MapPaintPreferenceTestIT {
      */
     @Test
     public void testValidityOfAvailableStyles() throws Exception {
+        ImageProvider.clearCache();
         Collection<ExtendedSourceEntry> sources = new MapPaintPreference.MapPaintSourceEditor()
                 .loadAndGetAvailableSources();
         assertFalse(sources.isEmpty());
@@ -86,7 +88,7 @@ public class MapPaintPreferenceTestIT {
                     if (!errors.isEmpty()) {
                         allErrors.put(source.url, errors);
                     }
-                    if (!warnings.isEmpty() && !source.url.contains("yopaseopor/traffic_signs")) {
+                    if (!warnings.isEmpty() && !source.url.contains("yopaseopor/")) {
                         // ignore https://github.com/yopaseopor/traffic_signs_style_JOSM because of far too frequent missing icons errors
                         allWarnings.put(source.url, warnings);
                     }
@@ -96,6 +98,7 @@ public class MapPaintPreferenceTestIT {
                 }
             }
         }
+        ImageProvider.clearCache();
         assertTrue(allErrors.toString()+"\n"+allWarnings.toString(), allErrors.isEmpty() && allWarnings.isEmpty());
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java b/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java
index a83f7f5..9257d81 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java
@@ -19,6 +19,7 @@ import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.xml.sax.SAXException;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -49,6 +50,7 @@ public class TaggingPresetPreferenceTestIT {
      */
     @Test
     public void testValidityOfAvailablePresets() throws Exception {
+        ImageProvider.clearCache();
         Collection<ExtendedSourceEntry> sources = new TaggingPresetPreference.TaggingPresetSourceEditor()
                 .loadAndGetAvailableSources();
         assertFalse(sources.isEmpty());
@@ -76,13 +78,14 @@ public class TaggingPresetPreferenceTestIT {
                 }
             } catch (SAXException | IllegalArgumentException e) {
                 e.printStackTrace();
-                if (!source.url.contains("yopaseopor/traffic_signs")) {
+                if (!source.url.contains("yopaseopor/")) {
                     // ignore https://raw.githubusercontent.com/yopaseopor/traffic_signs_preset_JOSM cause too much errors
                     allErrors.add(e);
                 }
                 System.out.println(" => KO");
             }
         }
+        ImageProvider.clearCache();
         assertTrue(allErrors.toString(), allErrors.isEmpty());
         assertTrue(allMessages.toString(), allMessages.isEmpty());
     }
@@ -96,8 +99,7 @@ public class TaggingPresetPreferenceTestIT {
             if (message.contains(TaggingPreset.PRESET_ICON_ERROR_MSG_PREFIX)) {
                 error = true;
                 // ignore https://github.com/yopaseopor/traffic_signs_preset_JOSM because of far too frequent missing icons errors
-                // ignore https://github.com/OsmHackTW/josm-presets/pull/4 until pull request is merged
-                if (!source.url.contains("yopaseopor/traffic_signs") && !source.url.contains("OsmHackTW/josm-presets")) {
+                if (!source.url.contains("yopaseopor/traffic_signs")) {
                     allMessages.add(message);
                 }
             }
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTaskTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTaskTest.java
new file mode 100644
index 0000000..3db4b04
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTaskTest.java
@@ -0,0 +1,89 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.preferences.server;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.awt.Component;
+
+import javax.swing.JLabel;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link ApiUrlTestTask} class.
+ */
+public class ApiUrlTestTaskTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().timeout(30000);
+
+    private static final Component PARENT = new JLabel();
+
+    /**
+     * Unit test of {@link ApiUrlTestTask#ApiUrlTestTask} - null url.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullApiUrl() {
+        new ApiUrlTestTask(PARENT, null);
+    }
+
+    /**
+     * Unit test of {@link ApiUrlTestTask} - nominal url.
+     */
+    @Test
+    public void testNominalUrl() {
+        ApiUrlTestTask task = new ApiUrlTestTask(PARENT, OsmApi.DEFAULT_API_URL);
+        task.run();
+        assertTrue(task.isSuccess());
+    }
+
+    /**
+     * Unit test of {@link ApiUrlTestTask#alertInvalidUrl} - malformed url.
+     */
+    @Test
+    public void testAlertInvalidUrl() {
+        ApiUrlTestTask task = new ApiUrlTestTask(PARENT, "malformed url");
+        task.run();
+        assertFalse(task.isSuccess());
+    }
+
+    /**
+     * Unit test of {@link ApiUrlTestTask} - unknown host.
+     */
+    @Test
+    public void testUnknownHost() {
+        ApiUrlTestTask task = new ApiUrlTestTask(PARENT, "http://unknown");
+        task.run();
+        assertFalse(task.isSuccess());
+    }
+
+    /**
+     * Unit test of {@link ApiUrlTestTask#alertInvalidServerResult} - http 404.
+     */
+    @Test
+    public void testAlertInvalidServerResult() {
+        ApiUrlTestTask task = new ApiUrlTestTask(PARENT, "http://www.openstreetmap.org");
+        task.run();
+        assertFalse(task.isSuccess());
+    }
+
+    /**
+     * Unit test of {@link ApiUrlTestTask#alertInvalidCapabilities} - invalid contents.
+     */
+    @Test
+    public void testAlertInvalidCapabilities() {
+        ApiUrlTestTask task = new ApiUrlTestTask(PARENT, "https://josm.openstreetmap.de/export/10979/josm/trunk/test/data/invalid_api");
+        task.run();
+        assertFalse(task.isSuccess());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java
index 35c3dce..72c5511 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java
@@ -3,10 +3,12 @@ package org.openstreetmap.josm.gui.preferences.server;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link AuthenticationPreference} class.
@@ -14,12 +16,11 @@ import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
 public class AuthenticationPreferenceTest {
 
     /**
-     * Setup test.
+     * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform();
 
     /**
      * Unit test of {@link AuthenticationPreference#AuthenticationPreference}.
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java
index 45cd9b8..92ae370 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java
@@ -3,10 +3,12 @@ package org.openstreetmap.josm.gui.preferences.server;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link OverpassServerPreference} class.
@@ -14,12 +16,11 @@ import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
 public class OverpassServerPreferenceTest {
 
     /**
-     * Setup test.
+     * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform();
 
     /**
      * Unit test of {@link OverpassServerPreference#OverpassServerPreference}.
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java
index 0a235d3..737f149 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java
@@ -3,10 +3,12 @@ package org.openstreetmap.josm.gui.preferences.server;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link ProxyPreference} class.
@@ -14,12 +16,11 @@ import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
 public class ProxyPreferenceTest {
 
     /**
-     * Setup test.
+     * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform();
 
     /**
      * Unit test of {@link ProxyPreference#ProxyPreference}.
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java
index 759dcf6..63825b6 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java
@@ -3,10 +3,12 @@ package org.openstreetmap.josm.gui.preferences.server;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link ServerAccessPreference} class.
@@ -14,12 +16,11 @@ import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
 public class ServerAccessPreferenceTest {
 
     /**
-     * Setup test.
+     * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform();
 
     /**
      * Unit test of {@link ServerAccessPreference#ServerAccessPreference}.
diff --git a/test/unit/org/openstreetmap/josm/gui/util/FileFilterAllFilesTest.java b/test/unit/org/openstreetmap/josm/gui/util/FileFilterAllFilesTest.java
new file mode 100644
index 0000000..bca9f3d
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/util/FileFilterAllFilesTest.java
@@ -0,0 +1,24 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.util;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+
+import org.junit.Test;
+
+/**
+ * Unit tests of {@link FileFilterAllFiles} class.
+ */
+public class FileFilterAllFilesTest {
+
+    /**
+     * Unit test of method {@link FileFilterAllFiles#getInstance}.
+     */
+    @Test
+    public void testFileFilterAllFiles() {
+        assertTrue(FileFilterAllFiles.getInstance().accept(new File(".")));
+        assertNotNull(FileFilterAllFiles.getInstance().getDescription());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy b/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy
index 37937ad..e5330c1 100644
--- a/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy
+++ b/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy
@@ -1,12 +1,13 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
-
-import static org.junit.Assert.*
+package org.openstreetmap.josm.io
 
 import org.junit.Test
 import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlException
 import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlParser
 
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+
 class ChangesetQueryUrlParserTest {
     final shouldFail = new GroovyTestCase().&shouldFail
 
@@ -126,14 +127,8 @@ class ChangesetQueryUrlParserTest {
         q = parser.parse("time=2009-12-25T10:00:00Z")
         assert q != null
         assert q. at closedAfter != null
-        Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("GMT+0"));
-        cal.setTime(q. at closedAfter);
-        assert cal.get(Calendar.YEAR) == 2009
-        assert cal.get(Calendar.MONTH) == 11 // calendar is 0-based
-        assert cal.get(Calendar.DAY_OF_MONTH) == 25
-        assert cal.get(Calendar.HOUR_OF_DAY) == 10
-        assert cal.get(Calendar.MINUTE) == 0
-        assert cal.get(Calendar.SECOND) == 0
+        def cal = q. at closedAfter.toInstant().atOffset(ZoneOffset.UTC)
+        assert cal == OffsetDateTime.of(2009, 12, 25, 10, 0, 0, 0, ZoneOffset.UTC)
 
         // OK
         q = parser.parse("time=2009-12-25T10:00:00Z,2009-11-25T10:00:00Z")
diff --git a/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java b/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java
index 903d0a4..8a97325 100644
--- a/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java
+++ b/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java
@@ -76,4 +76,18 @@ public class GeoJSONWriterTest {
             assertTrue(writer.write().contains("MultiPolygon"));
         }
     }
+
+    /**
+     * Unit test for exporting invalid multipolygons, see #13827
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testMultipolygonRobustness() throws Exception {
+        try (FileInputStream in = new FileInputStream("data_nodist/multipolygon.osm")) {
+            DataSet ds = OsmReader.parseDataSet(in, null);
+            final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
+            final GeoJSONWriter writer = new GeoJSONWriter(layer);
+            assertTrue(writer.write().contains("MultiPolygon"));
+        }
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java b/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java
index eca6abe..ec4fad1 100644
--- a/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java
@@ -20,6 +20,7 @@ import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtils;
 import org.xml.sax.SAXException;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -47,9 +48,10 @@ public class NmeaReaderTest {
         assertEquals(0, in.getParserMalformed());
 
         final List<WayPoint> wayPoints = new ArrayList<>(in.data.tracks.iterator().next().getSegments().iterator().next().getWayPoints());
-        assertEquals("2016-01-25T05:05:09.200Z", wayPoints.get(0).get(GpxConstants.PT_TIME));
-        assertEquals("2016-01-25T05:05:09.400Z", wayPoints.get(1).get(GpxConstants.PT_TIME));
-        assertEquals("2016-01-25T05:05:09.600Z", wayPoints.get(2).get(GpxConstants.PT_TIME));
+        assertEquals("2016-01-25T05:05:09.2Z", wayPoints.get(0).get(GpxConstants.PT_TIME));
+        assertEquals("2016-01-25T05:05:09.4Z", wayPoints.get(1).get(GpxConstants.PT_TIME));
+        assertEquals("2016-01-25T05:05:09.6Z", wayPoints.get(2).get(GpxConstants.PT_TIME));
+        assertEquals(wayPoints.get(0).getTime(), DateUtils.fromString(wayPoints.get(0).get(GpxConstants.PT_TIME).toString()));
 
         final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
         assertEquals("2016-01-25T06:05:09.200+01", iso8601.format(wayPoints.get(0).getTime()));
diff --git a/test/unit/org/openstreetmap/josm/io/OsmChangesetParserTest.java b/test/unit/org/openstreetmap/josm/io/OsmChangesetParserTest.java
new file mode 100644
index 0000000..a37baa4
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/OsmChangesetParserTest.java
@@ -0,0 +1,91 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link OsmChangesetParser} class.
+ */
+public class OsmChangesetParserTest {
+
+    private static final String BEGIN =
+        "<osm version=\"0.6\" generator=\"OpenStreetMap server\" copyright=\"OpenStreetMap and contributors\" " +
+                "attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">" +
+            "<changeset id=\"36749147\" user=\"kesler\" uid=\"13908\" created_at=\"2016-01-22T21:55:37Z\" "+
+                "closed_at=\"2016-01-22T21:56:39Z\"  open=\"false\" min_lat=\"36.6649211\" min_lon=\"55.377015\" max_lat=\"38.1490357\" " +
+                "max_lon=\"60.3766983\" comments_count=\"2\">" +
+            "<tag k=\"created_by\" v=\"JOSM/1.5 (9329 en)\"/>" +
+            "<tag k=\"comment\" v=\"Fixing errors in North Khorasan\"/>";
+
+    private static final String DISCUSSION =
+        "<discussion>" +
+        "<comment date=\"2016-09-13T13:28:20Z\" uid=\"1733149\" user=\"Jean Passepartout\">" +
+            "<text>" +
+                "Hi keeler, Thank you for contributing to OpenStreetMap. " +
+                "I noticed you added this way: http://www.openstreetmap.org/way/363580576, " +
+                "but it is a duplicate of another way, with a different name. "+
+                "Could you review and fix this? Please let me know if you need any help. " +
+                "Thank you and Happy Mapping! Jean Passepartout" +
+            "</text>" +
+        "</comment>" +
+        "<comment date=\"2016-09-17T21:58:57Z\" uid=\"13908\" user=\"kesler\">" +
+            "<text>" +
+                "Hi Jean, Thanks for your attempts to fix Iran map errors and please excuse me for delayed reply. "+
+                "I fixed my mistake and developed Esfarayen town map more in changeset https://www.openstreetmap.org/changeset/42234849. " +
+                "Please feel free and don't hesitate to tell me every big or even minor mis-mapped area in Iran. Thaks." +
+            "</text>" +
+        "</comment>" +
+        "</discussion>";
+
+    private static final String END =
+        "</changeset>" +
+        "</osm>";
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    private static List<Changeset> parse(String cs) throws IllegalDataException {
+        return OsmChangesetParser.parse(new ByteArrayInputStream(cs.getBytes(StandardCharsets.UTF_8)), NullProgressMonitor.INSTANCE);
+    }
+
+    /**
+     * Parse single changeset - without discussion
+     * @throws IllegalDataException in case of error
+     */
+    @Test
+    public void testParseWithoutDiscussion() throws IllegalDataException {
+        // http://api.openstreetmap.org/api/0.6/changeset/36749147
+        Changeset cs = parse(BEGIN + END).iterator().next();
+        assertEquals(2, cs.getCommentsCount());
+        assertTrue(cs.getDiscussion().isEmpty());
+    }
+
+    /**
+     * Parse single changeset - with discussion
+     * @throws IllegalDataException in case of error
+     */
+    @Test
+    public void testParseWithDiscussion() throws IllegalDataException {
+        // http://api.openstreetmap.org/api/0.6/changeset/36749147?include_discussion=true
+        Changeset cs = parse(BEGIN + DISCUSSION + END).iterator().next();
+        assertEquals(2, cs.getCommentsCount());
+        assertEquals(2, cs.getDiscussion().size());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java b/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
new file mode 100644
index 0000000..1941c43
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
@@ -0,0 +1,79 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
+import org.openstreetmap.josm.tools.Utils;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link OverpassDownloadReader} class.
+ */
+public class OverpassDownloadReaderTest {
+
+    /**
+     * Base test environment is enough
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().timeout(15000);
+
+    private String getExpandedQuery(String search) {
+        final String query = OverpassTurboQueryWizard.getInstance().constructQuery(search);
+        final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), OverpassServerPreference.getOverpassServer(), query)
+                .getRequestForBbox(1, 2, 3, 4)
+                .substring("interpreter?data=".length());
+        return Utils.decodeUrl(request);
+    }
+
+    /**
+     * Tests evaluating the extended query feature {@code bbox}.
+     */
+    @Test
+    public void testBbox() {
+        final String query = getExpandedQuery("amenity=drinking_water");
+        assertEquals("" +
+                "[out:xml][timeout:25][bbox:2.0,1.0,4.0,3.0];\n" +
+                "(\n" +
+                "  node[\"amenity\"=\"drinking_water\"];\n" +
+                "  way[\"amenity\"=\"drinking_water\"];\n" +
+                "  relation[\"amenity\"=\"drinking_water\"];\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;", query);
+    }
+
+    /**
+     * Tests evaluating the extended query feature {@code geocodeArea}.
+     */
+    @Test
+    public void testGeocodeArea() {
+        final String query = getExpandedQuery("amenity=drinking_water in London");
+        assertEquals("" +
+                "[out:xml][timeout:25];\n" +
+                "area(3600065606)->.searchArea;\n" +
+                "(\n" +
+                "  node[\"amenity\"=\"drinking_water\"](area.searchArea);\n" +
+                "  way[\"amenity\"=\"drinking_water\"](area.searchArea);\n" +
+                "  relation[\"amenity\"=\"drinking_water\"](area.searchArea);\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;", query);
+    }
+
+    /**
+     * Tests evaluating the extended query feature {@code geocodeArea}.
+     */
+    @Test
+    public void testGeocodeUnknownArea() {
+        final String query = OverpassDownloadReader.expandExtendedQueries("{{geocodeArea:foo-bar-baz-does-not-exist}}");
+        assertEquals("// Failed to evaluate {{geocodeArea:foo-bar-baz-does-not-exist}}\n", query);
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/auth/CredentialsAgentExceptionTest.java b/test/unit/org/openstreetmap/josm/io/auth/CredentialsAgentExceptionTest.java
new file mode 100644
index 0000000..8451da4
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/auth/CredentialsAgentExceptionTest.java
@@ -0,0 +1,37 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.auth;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link CredentialsAgentException} class.
+ */
+public class CredentialsAgentExceptionTest {
+
+    /**
+     * Setup test
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Unit test of {@code CredentialsAgentException#CredentialsAgentException}
+     */
+    @Test
+    public void testCredentialsAgentException() {
+        String msg = "test1";
+        Exception cause = new Exception("test2");
+        assertEquals(msg, new CredentialsAgentException(msg).getMessage());
+        assertEquals(cause, new CredentialsAgentException(cause).getCause());
+        CredentialsAgentException exc = new CredentialsAgentException(msg, cause);
+        assertEquals(msg, exc.getMessage());
+        assertEquals(cause, exc.getCause());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java
index 89d9393..e3fb551 100644
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java
@@ -30,7 +30,7 @@ public class AddNodeHandlerTest {
         JOSMFixture.createUnitTestFixture().init(true);
     }
 
-    private static AddNodeHandler newHandler(String url) {
+    private static AddNodeHandler newHandler(String url) throws RequestHandlerBadRequestException {
         AddNodeHandler req = new AddNodeHandler();
         if (url != null)
             req.setUrl(url);
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java
index e975cc5..0fd302a 100644
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java
@@ -30,7 +30,7 @@ public class AddWayHandlerTest {
         JOSMFixture.createUnitTestFixture().init(true);
     }
 
-    private static AddWayHandler newHandler(String url) {
+    private static AddWayHandler newHandler(String url) throws RequestHandlerBadRequestException {
         AddWayHandler req = new AddWayHandler();
         if (url != null)
             req.setUrl(url);
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java
index 9ede29f..2aa4e60 100644
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java
@@ -27,7 +27,7 @@ public class ImageryHandlerTest {
         JOSMFixture.createUnitTestFixture().init(true);
     }
 
-    private static ImageryHandler newHandler(String url) {
+    private static ImageryHandler newHandler(String url) throws RequestHandlerBadRequestException {
         ImageryHandler req = new ImageryHandler();
         if (url != null)
             req.setUrl(url);
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java
index 1bd392e..1043019 100644
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java
@@ -35,7 +35,7 @@ public class ImportHandlerTest {
         JOSMFixture.createUnitTestFixture().init(true);
     }
 
-    private static ImportHandler newHandler(String url) {
+    private static ImportHandler newHandler(String url) throws RequestHandlerBadRequestException {
         ImportHandler req = new ImportHandler();
         if (url != null)
             req.setUrl(url);
@@ -44,9 +44,10 @@ public class ImportHandlerTest {
 
     /**
      * Non-regression test for bug #7434.
+     * @throws Exception if any error occurs
      */
     @Test
-    public void testTicket7434() {
+    public void testTicket7434() throws Exception {
         ImportHandler req = newHandler("http://localhost:8111/import?url=http://localhost:8888/relations?relations=19711&mode=recursive");
         assertEquals("http://localhost:8888/relations?relations=19711&mode=recursive", req.args.get("url"));
     }
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java
index 29c779a..2f92840 100644
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java
@@ -27,7 +27,7 @@ public class LoadAndZoomHandlerTest {
         JOSMFixture.createUnitTestFixture().init(true);
     }
 
-    private static LoadAndZoomHandler newHandler(String url) {
+    private static LoadAndZoomHandler newHandler(String url) throws RequestHandlerBadRequestException {
         LoadAndZoomHandler req = new LoadAndZoomHandler();
         if (url != null)
             req.setUrl(url);
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandlerTest.java
index 26c281f..1f8ed54 100644
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandlerTest.java
@@ -27,7 +27,7 @@ public class LoadObjectHandlerTest {
         JOSMFixture.createUnitTestFixture().init(true);
     }
 
-    private static LoadObjectHandler newHandler(String url) {
+    private static LoadObjectHandler newHandler(String url) throws RequestHandlerBadRequestException {
         LoadObjectHandler req = new LoadObjectHandler();
         if (url != null)
             req.setUrl(url);
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java
index d890b5b..eb342d6 100644
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java
@@ -9,13 +9,14 @@ import java.util.Map;
 
 import org.junit.Test;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
 
 /**
  * Unit tests of {@link RequestHandler} class.
  */
 public class RequestHandlerTest {
 
-    Map<String, String> getRequestParameter(String url) {
+    Map<String, String> getRequestParameter(String url) throws RequestHandlerBadRequestException {
         final RequestHandler req = new RequestHandler() {
             @Override
             protected void validateRequest() throws RequestHandlerBadRequestException {
@@ -46,9 +47,10 @@ public class RequestHandlerTest {
 
     /**
      * Test request parameter - case 1
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter1() {
+    public void testRequestParameter1() throws RequestHandlerBadRequestException {
         final Map<String, String> expected = new HashMap<>();
         expected.put("query", "a");
         expected.put("b", "=c");
@@ -57,18 +59,20 @@ public class RequestHandlerTest {
 
     /**
      * Test request parameter - case 2
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter2() {
+    public void testRequestParameter2() throws RequestHandlerBadRequestException {
         assertEquals(Collections.singletonMap("query", "a&b==c"),
                 getRequestParameter("http://example.com/?query=a%26b==c"));
     }
 
     /**
      * Test request parameter - case 3
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter3() {
+    public void testRequestParameter3() throws RequestHandlerBadRequestException {
         assertEquals(Collections.singleton("blue+light blue"),
                 getRequestParameter("http://example.com/blue+light%20blue?blue%2Blight+blue").keySet());
     }
@@ -77,9 +81,10 @@ public class RequestHandlerTest {
      * Test request parameter - case 4
      * @see <a href="http://blog.lunatech.com/2009/02/03/what-every-web-developer-must-know-about-url-encoding">
      *      What every web developer must know about URL encoding</a>
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter4() {
+    public void testRequestParameter4() throws RequestHandlerBadRequestException {
         assertEquals(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;=="), getRequestParameter(
                 // CHECKSTYLE.OFF: LineLength
                 "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="));
@@ -88,12 +93,44 @@ public class RequestHandlerTest {
 
     /**
      * Test request parameter - case 5
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter5() {
+    public void testRequestParameter5() throws RequestHandlerBadRequestException {
         final Map<String, String> expected = new HashMap<>();
         expected.put("space", " ");
         expected.put("tab", "\t");
         assertEquals(expected, getRequestParameter("http://example.com/?space=%20&tab=%09"));
     }
+
+    /**
+     * Test request parameter - case 6
+     * @throws RequestHandlerBadRequestException never
+     */
+    @Test
+    public void testRequestParameter6() throws RequestHandlerBadRequestException {
+        final Map<String, String> expected = new HashMap<>();
+        expected.put("addtags", "wikipedia:de=Weiße_Gasse|maxspeed=5");
+        expected.put("select", "way23071688,way23076176,way23076177,");
+        expected.put("left", "13.739727546842");
+        expected.put("right", "13.740890970188");
+        expected.put("top", "51.049987191025");
+        expected.put("bottom", "51.048466954325");
+        assertEquals(expected, getRequestParameter("http://localhost:8111/load_and_zoom"+
+                "?addtags=wikipedia%3Ade=Wei%C3%9Fe_Gasse%7Cmaxspeed=5"+
+                "&select=way23071688,way23076176,way23076177,"+
+                "&left=13.739727546842&right=13.740890970188&top=51.049987191025&bottom=51.048466954325"));
+    }
+
+    /**
+     * Test request parameter - invalid case
+     * @throws RequestHandlerBadRequestException always
+     */
+    @Test(expected = RequestHandlerBadRequestException.class)
+    public void testRequestParameterInvalid() throws RequestHandlerBadRequestException {
+        getRequestParameter("http://localhost:8111/load_and_zoom"+
+                "?addtags=wikipedia:de=Wei%C3%9Fe_Gasse|maxspeed=5"+
+                "&select=way23071688,way23076176,way23076177,"+
+                "&left=13.739727546842&right=13.740890970188&top=51.049987191025&bottom=51.048466954325");
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
index abb8a2d..9e12871 100644
--- a/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
+++ b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
@@ -7,17 +7,29 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.plugins.PluginHandler.DynamicURLClassLoader;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -78,7 +90,63 @@ public class PluginHandlerTestIT {
         // Load late plugins
         PluginHandler.loadLatePlugins(null, plugins, null);
 
-        assertTrue(PluginHandler.pluginLoadingExceptions.toString(), PluginHandler.pluginLoadingExceptions.isEmpty());
+        Map<String, Throwable> loadingExceptions = PluginHandler.pluginLoadingExceptions.entrySet().stream()
+                .collect(Collectors.toMap(e -> e.getKey(), e -> ExceptionUtils.getRootCause(e.getValue())));
+
+        // Add/remove layers twice to test basic plugin good behaviour
+        Map<String, Throwable> layerExceptions = new HashMap<>();
+        List<PluginInformation> loadedPlugins = PluginHandler.getPlugins();
+        for (int i = 0; i < 2; i++) {
+            OsmDataLayer layer = new OsmDataLayer(new DataSet(), "Layer "+i, null);
+            testPlugin(Main.getLayerManager()::addLayer, layer, layerExceptions, loadedPlugins);
+            testPlugin(Main.getLayerManager()::removeLayer, layer, layerExceptions, loadedPlugins);
+        }
+        for (int i = 0; i < 2; i++) {
+            GpxLayer layer = new GpxLayer(new GpxData());
+            testPlugin(Main.getLayerManager()::addLayer, layer, layerExceptions, loadedPlugins);
+            testPlugin(Main.getLayerManager()::removeLayer, layer, layerExceptions, loadedPlugins);
+        }
+
+        MapUtils.debugPrint(System.out, null, loadingExceptions);
+        MapUtils.debugPrint(System.out, null, layerExceptions);
+        String msg = Arrays.toString(loadingExceptions.entrySet().toArray()) + '\n' +
+                     Arrays.toString(layerExceptions.entrySet().toArray());
+        assertTrue(msg, loadingExceptions.isEmpty() && layerExceptions.isEmpty());
+    }
+
+    void testPlugin(Consumer<Layer> consumer, Layer layer,
+            Map<String, Throwable> layerExceptions, Collection<PluginInformation> loadedPlugins) {
+        try {
+            consumer.accept(layer);
+        } catch (Exception | LinkageError t) {
+            Throwable root = ExceptionUtils.getRootCause(t);
+            root.printStackTrace();
+            layerExceptions.put(findFaultyPlugin(loadedPlugins, root), root);
+        }
+    }
+
+    private static String findFaultyPlugin(Collection<PluginInformation> plugins, Throwable root) {
+        DynamicURLClassLoader cl = PluginHandler.getPluginClassLoader();
+        for (PluginInformation p : plugins) {
+            try {
+                String pluginPackage = cl.loadClass(p.className).getPackage().getName();
+                for (StackTraceElement e : root.getStackTrace()) {
+                    try {
+                        String stackPackage = cl.loadClass(e.getClassName()).getPackage().getName();
+                        if (stackPackage.startsWith(pluginPackage)) {
+                            return p.name;
+                        }
+                    } catch (ClassNotFoundException ex) {
+                        System.err.println(ex.getMessage());
+                        continue;
+                    }
+                }
+            } catch (ClassNotFoundException ex) {
+                System.err.println(ex.getMessage());
+                continue;
+            }
+        }
+        return "<unknown>";
     }
 
     /**
diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
index 3d7558a..3f31fea 100644
--- a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
+++ b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
@@ -268,7 +268,7 @@ public class JOSMTestRules implements TestRule {
         MemoryManagerTest.resetState(allowMemoryManagerLeaks);
 
         // TODO: Remove global listeners and other global state.
-        Main.pref.resetToInitialState();;
+        Main.pref.resetToInitialState();
         Main.platform = null;
         // Parts of JOSM uses weak references - destroy them.
         System.gc();
diff --git a/test/unit/org/openstreetmap/josm/tools/AudioPlayerTest.java b/test/unit/org/openstreetmap/josm/tools/AudioPlayerTest.java
index 147c18b..69d7501 100644
--- a/test/unit/org/openstreetmap/josm/tools/AudioPlayerTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/AudioPlayerTest.java
@@ -9,6 +9,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
@@ -16,6 +17,7 @@ import org.openstreetmap.josm.TestUtils;
 /**
  * Unit tests of {@link AudioPlayer} class.
  */
+ at Ignore("unresolved sporadic deadlock - see #13809")
 public class AudioPlayerTest {
 
     // We play wav files of about 4 seconds + pause, so define timeout at 16 seconds
@@ -57,6 +59,7 @@ public class AudioPlayerTest {
             System.out.println("Play finished after " + Utils.getDurationString(duration));
             assertTrue(duration < MAX_DURATION);
             AudioPlayer.reset();
+            Thread.sleep(1000); // precaution, see #13809
         }
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java b/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java
index 0fcf036..0b9d87b 100644
--- a/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java
@@ -9,9 +9,9 @@ import java.io.IOException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
 import org.junit.Before;
@@ -23,7 +23,6 @@ import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * EXIF metadata extraction test
  * @since 6209
@@ -54,12 +53,13 @@ public class ExifReaderTest {
     @Test
     public void testReadTime() throws ParseException {
         Date date = ExifReader.readTime(directionSampleFile);
-        assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 17, 12, 05).getTime(), date);
+        assertEquals(ZonedDateTime.of(2010, 5, 15, 17, 12, 5, 0, ZoneId.systemDefault()).toInstant(), date.toInstant());
 
-        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
+        final TimeZone zone = TimeZone.getTimeZone("Europe/Berlin");
+        TimeZone.setDefault(zone);
         date = ExifReader.readTime(directionSampleFile);
         TimeZone.setDefault(DateUtils.UTC);
-        assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 15, 12, 05).getTime(), date);
+        assertEquals(ZonedDateTime.of(2010, 5, 15, 17, 12, 5, 0, zone.toZoneId()).toInstant(), date.toInstant());
     }
 
     /**
diff --git a/test/unit/org/openstreetmap/josm/tools/FontsManagerTest.java b/test/unit/org/openstreetmap/josm/tools/FontsManagerTest.java
new file mode 100644
index 0000000..bd3f1d9
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/FontsManagerTest.java
@@ -0,0 +1,44 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.fail;
+
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link FontsManager} class.
+ */
+public class FontsManagerTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Test method for {@code FontsManager#initialize}
+     */
+    @Test
+    public void testFontsManager() {
+        FontsManager.initialize();
+        boolean found = false;
+        for (Font f : GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts()) {
+            if (f.getName().contains("Droid")) {
+                System.out.println(f);
+                found = true;
+            }
+        }
+        if (!found) {
+            fail("DroidSans font not found");
+        }
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java b/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java
index c831107..1004f06 100644
--- a/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java
@@ -27,7 +27,7 @@ public class OverpassTurboQueryWizardTest {
     public void testKeyValue() {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("amenity=drinking_water");
         assertEquals("" +
-                "[out:xml][timeout:25];\n" +
+                "[out:xml][timeout:25][bbox:{{bbox}}];\n" +
                 "(\n" +
                 "  node[\"amenity\"=\"drinking_water\"];\n" +
                 "  way[\"amenity\"=\"drinking_water\"];\n" +
diff --git a/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java b/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java
index 2747ba8..d6a8c47 100644
--- a/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java
@@ -75,14 +75,6 @@ public class PlatformHookOsxTest {
     }
 
     /**
-     * Test method for {@code PlatformHookOsx#getAdditionalFonts}
-     */
-    @Test(expected = UnsupportedOperationException.class)
-    public void testGetAdditionalFonts() {
-        hook.getAdditionalFonts();
-    }
-
-    /**
      * Test method for {@code PlatformHookOsx#getDefaultCacheDirectory}
      */
     @Test
@@ -115,14 +107,6 @@ public class PlatformHookOsxTest {
     }
 
     /**
-     * Test method for {@code PlatformHookOsx#getInstalledFonts}
-     */
-    @Test(expected = UnsupportedOperationException.class)
-    public void testGetInstalledFonts() {
-        hook.getInstalledFonts();
-    }
-
-    /**
      * Test method for {@code PlatformHookOsx#getOSDescription}
      */
     @Test
diff --git a/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSettingsPanelTest.java b/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSettingsPanelTest.java
new file mode 100644
index 0000000..d12c213
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSettingsPanelTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools.bugreport;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Tests the {@link BugReportSettingsPanel} class.
+ */
+public class BugReportSettingsPanelTest {
+
+    /**
+     * Setup test
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Test {@link BugReportSettingsPanel}
+     */
+    @Test
+    public void testBugReportSettingsPanel() {
+        assertNotNull(new BugReportSettingsPanel(new BugReport(BugReport.intercept(new Exception()))));
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/bugreport/DebugTextDisplayTest.java b/test/unit/org/openstreetmap/josm/tools/bugreport/DebugTextDisplayTest.java
new file mode 100644
index 0000000..267020d
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/bugreport/DebugTextDisplayTest.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools.bugreport;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit test of {@link DebugTextDisplay} class.
+ */
+public class DebugTextDisplayTest {
+    /**
+     * Setup test
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Test {@link DebugTextDisplay#getCodeText}
+     */
+    @Test
+    public void testGetCodeText() {
+        assertEquals("test", new DebugTextDisplay("test").getCodeText());
+    }
+
+    /**
+     * Test {@link DebugTextDisplay#copyToClipboard}
+     */
+    @Test
+    public void testCopyToClipboard() {
+        new DebugTextDisplay("copy").copyToClipboard();
+        assertEquals(String.format("{{{%ncopy%n}}}"), ClipboardUtils.getClipboardStringContent());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java b/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
index 23373d2..f29798a 100644
--- a/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
@@ -113,6 +113,18 @@ public class DateUtilsTest {
     }
 
     /**
+     * Unit test of {@link DateUtils#fromDate} method.
+     */
+    @Test
+    public void testFromDate() throws Exception {
+        assertEquals("1970-01-01T00:00:00Z", DateUtils.fromDate(new Date(0)));
+        assertEquals("1970-01-01T00:00:00.1Z", DateUtils.fromDate(new Date(100)));
+        assertEquals("1970-01-01T00:00:00.12Z", DateUtils.fromDate(new Date(120)));
+        assertEquals("1970-01-01T00:00:00.123Z", DateUtils.fromDate(new Date(123)));
+        assertEquals("2016-01-25T04:05:09Z", DateUtils.fromDate(new Date(1453694709000L)));
+    }
+
+    /**
      * Unit test of {@link DateUtils#formatTime} method.
      */
     @Test
diff --git a/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java b/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
index ec69f6c..a525310 100644
--- a/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
@@ -173,6 +173,7 @@ public class TemplateParserTest {
         StringBuilder sb = new StringBuilder();
         entry.appendText(sb, dataProvider);
         Assert.assertEquals("name=waypointName, number=10", sb.toString());
+        Assert.assertEquals("{special:everything}", entry.toString());
     }
 
     /**
@@ -332,4 +333,13 @@ public class TemplateParserTest {
 
         Assert.assertEquals("child2", sb.toString());
     }
+
+    @Test
+    public void testToStringCanBeParsedAgain() throws Exception {
+        final String s1 = "?{ '{name} ({desc})' | '{name} ({cmt})' | '{name}' | '{desc}' | '{cmt}' }";
+        final String s2 = new TemplateParser(s1).parse().toString();
+        final String s3 = new TemplateParser(s2).parse().toString();
+        Assert.assertEquals(s1, s2);
+        Assert.assertEquals(s2, s3);
+    }
 }

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